Merge remote-tracking branch 'adafruit/main' into fix_samd_timer_leak

Author: tannewt

.github/workflows/build.yml

@@ -326,11 +326,13 @@ jobs:
         - "pewpew10"
         - "pewpew_m4"
         - "picoplanet"
+        - "pimoroni_interstate75"
         - "pimoroni_keybow2040"
         - "pimoroni_pga2040"
         - "pimoroni_picolipo_16mb"
         - "pimoroni_picolipo_4mb"
         - "pimoroni_picosystem"
+        - "pimoroni_plasma2040"
         - "pimoroni_tiny2040"
         - "pitaya_go"
         - "pyb_nano_v2"
@@ -370,6 +372,7 @@ jobs:
         - "sparkfun_samd21_mini"
         - "sparkfun_samd51_micromod"
         - "sparkfun_samd51_thing_plus"
+        - "sparkfun_stm32f405_micromod"
         - "sparkfun_thing_plus_rp2040"
         - "spresense"
         - "stackrduino_m0_pro"
@@ -461,7 +464,7 @@ jobs:
     - name: Install deps
       run: |
         sudo apt-get install -y gettext
-        pip install requests sh click setuptools awscli
+        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
@@ -503,6 +506,7 @@ jobs:
         - "adafruit_metro_esp32s2"
         - "artisense_rd00"
         - "atmegazero_esp32s2"
+        - "crumpspace_crumps2"
         - "electroniccats_bastwifi"
         - "espressif_kaluga_1"
         - "espressif_kaluga_1.3"
@@ -516,6 +520,7 @@ jobs:
         - "gravitech_cucumber_rs"
         - "lilygo_ttgo_t8_s2_st7789"
         - "microdev_micro_s2"
+        - "morpheans_morphesp-240"
         - "muselab_nanoesp32_s2_wroom"
         - "muselab_nanoesp32_s2_wrover"
         - "targett_module_clip_wroom"

README.rst

@@ -21,7 +21,7 @@ besides a text editor (we recommend `Mu <https://codewith.mu/>`_ for beginners.)
 Starting with CircuitPython 7.0.0, some boards may only be connectable over Bluetooth Low Energy
 (BLE). Those boards provide serial and file access over BLE instead of USB using open protocols.
 (Some boards may use both USB and BLE.) BLE access can be done from a variety of apps including
-`code.circuitpythonn.org <https://code.circuitpython.org>`_.
+`code.circuitpython.org <https://code.circuitpython.org>`_.
 
 CircuitPython features unified Python core APIs and a growing list of 300+ device libraries and
 drivers that work with it. These libraries also work on single board computers with regular

lib/utils/pyexec.c

@@ -149,7 +149,7 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
             mp_hal_stdout_tx_strn("\x04", 1);
         }
         // check for SystemExit
-        if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(((mp_obj_base_t *)nlr.ret_val)->type), MP_OBJ_FROM_PTR(&mp_type_SystemExit))) {
+        if (mp_obj_is_subclass_fast(mp_obj_get_type((mp_obj_t)nlr.ret_val), MP_OBJ_FROM_PTR(&mp_type_SystemExit))) {
             // at the moment, the value of SystemExit is unused
             ret = pyexec_system_exit;
         #if CIRCUITPY_ALARM

locale/ID.po

@@ -500,6 +500,10 @@ msgstr ""
 msgid "Attempted heap allocation when VM not running."
 msgstr ""
 
+#: ports/raspberrypi/audio_dma.c
+msgid "Audio conversion not implemented"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "AuthMode.OPEN is not used with password"
 msgstr ""
@@ -1237,6 +1241,10 @@ msgstr "Otentikasi tidak cukup"
 msgid "Insufficient encryption"
 msgstr "Enkripsi tidak cukup"
 
+#: ports/raspberrypi/audio_dma.c
+msgid "Internal audio buffer too small"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "Internal define error"
 msgstr "Kesalahan definisi internal"

locale/circuitpython.pot

@@ -493,6 +493,10 @@ msgstr ""
 msgid "Attempted heap allocation when VM not running."
 msgstr ""
 
+#: ports/raspberrypi/audio_dma.c
+msgid "Audio conversion not implemented"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "AuthMode.OPEN is not used with password"
 msgstr ""
@@ -1217,6 +1221,10 @@ msgstr ""
 msgid "Insufficient encryption"
 msgstr ""
 
+#: ports/raspberrypi/audio_dma.c
+msgid "Internal audio buffer too small"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "Internal define error"
 msgstr ""

locale/cs.po

@@ -496,6 +496,10 @@ msgstr ""
 msgid "Attempted heap allocation when VM not running."
 msgstr ""
 
+#: ports/raspberrypi/audio_dma.c
+msgid "Audio conversion not implemented"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "AuthMode.OPEN is not used with password"
 msgstr ""
@@ -1220,6 +1224,10 @@ msgstr ""
 msgid "Insufficient encryption"
 msgstr ""
 
+#: ports/raspberrypi/audio_dma.c
+msgid "Internal audio buffer too small"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "Internal define error"
 msgstr ""

locale/de_DE.po

@@ -502,6 +502,10 @@ msgstr "Versuche %d Blöcke zu allokieren"
 msgid "Attempted heap allocation when VM not running."
 msgstr ""
 
+#: ports/raspberrypi/audio_dma.c
+msgid "Audio conversion not implemented"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "AuthMode.OPEN is not used with password"
 msgstr ""
@@ -1237,6 +1241,10 @@ msgstr "Unzureichende Authentifizierung"
 msgid "Insufficient encryption"
 msgstr "Unzureichende Verschlüsselung"
 
+#: ports/raspberrypi/audio_dma.c
+msgid "Internal audio buffer too small"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "Internal define error"
 msgstr "Interner Definitionsfehler"

locale/el.po

@@ -493,6 +493,10 @@ msgstr ""
 msgid "Attempted heap allocation when VM not running."
 msgstr ""
 
+#: ports/raspberrypi/audio_dma.c
+msgid "Audio conversion not implemented"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "AuthMode.OPEN is not used with password"
 msgstr ""
@@ -1217,6 +1221,10 @@ msgstr ""
 msgid "Insufficient encryption"
 msgstr ""
 
+#: ports/raspberrypi/audio_dma.c
+msgid "Internal audio buffer too small"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "Internal define error"
 msgstr ""

locale/en_GB.po

@@ -502,6 +502,10 @@ msgstr "Attempt to allocate %d blocks"
 msgid "Attempted heap allocation when VM not running."
 msgstr ""
 
+#: ports/raspberrypi/audio_dma.c
+msgid "Audio conversion not implemented"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "AuthMode.OPEN is not used with password"
 msgstr ""
@@ -1232,6 +1236,10 @@ msgstr "Insufficient authentication"
 msgid "Insufficient encryption"
 msgstr "Insufficient encryption"
 
+#: ports/raspberrypi/audio_dma.c
+msgid "Internal audio buffer too small"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "Internal define error"
 msgstr "Internal define error"

locale/es.po

@@ -506,6 +506,10 @@ msgstr "Tratando de localizar %d bloques"
 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 ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "AuthMode.OPEN is not used with password"
 msgstr "AuthMode.OPEN no se usa con contraseña"
@@ -1250,6 +1254,10 @@ msgstr "Autenticación insuficiente"
 msgid "Insufficient encryption"
 msgstr "Cifrado insuficiente"
 
+#: ports/raspberrypi/audio_dma.c
+msgid "Internal audio buffer too small"
+msgstr ""
+
 #: ports/stm/common-hal/busio/UART.c
 msgid "Internal define error"
 msgstr "Error interno de definición"