Merge remote-tracking branch 'adafruit/main' into audioeffect-reverb

Author: gamblor21

.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-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/arm-gnu-toolchain-13.3.rel1-x86_64-aarch64-none-elf.tar.xz
+        sudo tar -C /usr --strip-components=1 -xaf arm-gnu-toolchain-13.3.rel1-x86_64-aarch64-none-elf.tar.xz
         sudo apt-get update
         sudo apt-get install -y mtools
       shell: bash

.gitignore

@@ -97,3 +97,8 @@ TAGS
 # clangd cache
 ##############
 .cache
+
+**/CLAUDE.local.md
+
+# windsurf rules
+.windsurfrules

.gitmodules

@@ -172,7 +172,8 @@
 	url = https://github.com/adafruit/Adafruit_CircuitPython_SimpleMath
 [submodule "ports/raspberrypi/sdk"]
 	path = ports/raspberrypi/sdk
-	url = https://github.com/raspberrypi/pico-sdk.git
+	url = https://github.com/adafruit/pico-sdk.git
+	branch = force_inline_critical_section
 [submodule "data/nvm.toml"]
 	path = data/nvm.toml
 	url = https://github.com/adafruit/nvm.toml.git
@@ -345,7 +346,7 @@
 	url = https://github.com/adafruit/Adafruit_CircuitPython_Wave.git
 [submodule "ports/raspberrypi/lib/Pico-PIO-USB"]
 	path = ports/raspberrypi/lib/Pico-PIO-USB
-	url = https://github.com/adafruit/Pico-PIO-USB.git
+	url = https://github.com/sekigon-gonnoc/Pico-PIO-USB.git
 	branch = main
 [submodule "lib/micropython-lib"]
 	path = lib/micropython-lib

.pre-commit-config.yaml

@@ -4,19 +4,33 @@
 
 # CIRCUITPY-CHANGE: CircuitPython-specific.
 
+# Note that by default, pre-commit hooks do not look inside submodules.
+# So you don't need to exclude submodules explicitly here.
+
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
-    -   id: check-yaml
-    -   id: end-of-file-fixer
-        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/mimxrt10xx/sdk|ports/raspberrypi/sdk|lib/tinyusb)'
-    -   id: trailing-whitespace
-        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/generate_errors.diff|ports/raspberrypi/sdk|ports/mimxrt10xx/sdk|lib/tinyusb)'
--   repo: https://github.com/codespell-project/codespell
+      - id: check-yaml
+      - id: end-of-file-fixer
+        exclude: |
+          (?x)^(
+            tests/.*\.exp|
+            tests/cmdline/.*|
+            tests/.*/data/.*
+          )
+      - id: trailing-whitespace
+        exclude: |
+          (?x)^(
+            tests/.*\.exp|
+            tests/cmdline/.*|
+            tests/.*/data/.*|
+            lib/mbedtls_errors/generate_errors.diff
+          )
+  - repo: https://github.com/codespell-project/codespell
     rev: v2.2.4
     hooks:
-    -   id: codespell
+      - id: codespell
         args: [-w]
         exclude: |
           (?x)^(
@@ -25,38 +39,30 @@ repos:
             tests/unicode/data/utf-8_invalid.txt|
             tests/extmod/data/qr.pgm|
             tests/basics/bytearray_byte_operations.py|
-            ports/raspberrypi/sdk|
             ports/zephyr-cp/cptools/compat2driver.py
           )
--   repo: local
+  - repo: local
     hooks:
-    -   id: translations
+      - id: translations
         name: Translations
         entry: sh -c "if ! make check-translate; then make translate; fi"
         types: [c]
         pass_filenames: false
         language: system
-    -   id: formatting
+      - id: formatting
         name: Formatting
-        entry: python3 tools/codeformat.py
-        types: [c]
-        language: system
-        exclude: |
-          (?x)^(
-            lib/tinyusb|
-            ports/raspberrypi/sdk
-          )
-- repo: https://github.com/astral-sh/ruff-pre-commit
-  # Ruff version.
-  rev: v0.9.4
-  hooks:
-    # Run the linter.
-    - id: ruff
-      args: [ --fix ]
-    # Run the formatter.
-    - id: ruff-format
-- repo: https://github.com/tox-dev/pyproject-fmt
-  rev: "v2.5.0"
-  hooks:
-    - id: pyproject-fmt
-      exclude: '^(ports/mimxrt10xx/sdk)'
+        entry: python3 tools/codeformat.py -v -c
+        language: python
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.9.4
+    hooks:
+      # Run the linter.
+      - id: ruff
+        args: [ --fix ]
+      # Run the formatter.
+      - id: ruff-format
+  - repo: https://github.com/tox-dev/pyproject-fmt
+    rev: "v2.5.0"
+    hooks:
+      - id: pyproject-fmt

data/nvm.toml

@@ -189,4 +189,18 @@ This feature is not enabled on boards that the CIRCUITPY_OS_GETENV (os CIRCUIPTY
 flag has been set to 0. Currently this is primarily boards with limited flash including some
 of the Atmel_samd boards based on the SAMD21/M0 microprocessor.
 
+CIRCUITPY_TERMINAL_FONT
+~~~~~~~~~~~~~~~~~~~~~~~
+Specifies a custom font file path to use for the terminalio console instead of the default
+``/fonts/terminal.lvfontbin``. This allows users to create and use custom fonts for the
+CircuitPython console.
+
+This feature requires both CIRCUITPY_OS_GETENV and CIRCUITPY_LVFONTIO to be enabled.
+
+Example:
+
+.. code-block::
+
+    CIRCUITPY_TERMINAL_FONT="/fonts/myfont.lvfontbin"
+
 `boards that the terminalio core module is available on <https://docs.circuitpython.org/en/latest/shared-bindings/terminalio/>`_

docs/environment.rst

@@ -66,6 +66,8 @@
 
 ADDITIONAL_MODULES = {
     "_asyncio": "MICROPY_PY_ASYNCIO",
+    "_bleio (native)": "CIRCUITPY_BLEIO_NATIVE",
+    "_bleio (HCI co-processor)": "CIRCUITPY_BLEIO_HCI",
     "_eve": "CIRCUITPY__EVE",
     "adafruit_bus_device": "CIRCUITPY_BUSDEVICE",
     "adafruit_pixelbuf": "CIRCUITPY_PIXELBUF",

docs/shared_bindings_matrix.py

@@ -19,10 +19,30 @@ The workflow APIs are documented here.
 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
+### Mass Storage
 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.
+standard interface. (This is how USB drives work.) 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.
+
+CircuitPython 10.x adds multiple Logical Units (LUNs) to the mass storage interface. This allows for
+multiple drives to be accessed and ejected independently.
+
+#### CIRCUITPY drive
+The CIRCUITPY drive is the main drive that CircuitPython uses. It is writable by the host by default
+and read-only to CircuitPython. `storage.remount()` can be used to remount the drive to
+CircuitPython as read-write.
+
+#### CPSAVES drive
+The board may also expose a CPSAVES drive. (This is based on the ``CIRCUITPY_SAVES_PARTITION_SIZE``
+setting in ``mpconfigboard.h``.) It is a portion of the main flash that is writable by CircuitPython
+by default. It is read-only to the host. `storage.remount()` can be used to remount the drive to the
+host as read-write.
+
+#### SD card drive
+A few boards have SD card automounting. (This is based on the ``DEFAULT_SD`` settings in
+``mpconfigboard.h``.) The card is writable from CircuitPython by default and read-only to the host.
+`storage.remount()` can be used to remount the drive to the host as read-write.
 
 ### CDC serial
 CircuitPython exposes one CDC USB interface for CircuitPython serial. This is a standard serial

docs/workflows.md

@@ -160,11 +160,6 @@ static const mp_rom_map_elem_t task_queue_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_push), MP_ROM_PTR(&task_queue_push_obj) },
     { MP_ROM_QSTR(MP_QSTR_pop), MP_ROM_PTR(&task_queue_pop_obj) },
     { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&task_queue_remove_obj) },
-
-    // CIRCUITPY-CHANGE: Remove these in CircuitPython 10.0.0
-    { MP_ROM_QSTR(MP_QSTR_push_head), MP_ROM_PTR(&task_queue_push_obj) },
-    { MP_ROM_QSTR(MP_QSTR_push_sorted), MP_ROM_PTR(&task_queue_push_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pop_head), MP_ROM_PTR(&task_queue_pop_obj) },
 };
 static MP_DEFINE_CONST_DICT(task_queue_locals_dict, task_queue_locals_dict_table);
 

extmod/modasyncio.c

@@ -47,6 +47,11 @@
 #include "extmod/vfs_posix.h"
 #endif
 
+
+#if CIRCUITPY_SDCARDIO
+#include "shared-module/sdcardio/__init__.h"
+#endif
+
 // For mp_vfs_proxy_call, the maximum number of additional args that can be passed.
 // A fixed maximum size is used to avoid the need for a costly variable array.
 #define PROXY_MAX_ARGS (2)
@@ -67,6 +72,10 @@ mp_vfs_mount_t *mp_vfs_lookup_path(const char *path, const char **path_out) {
             // path is "" or "/" so return virtual root
             return MP_VFS_ROOT;
         }
+        // CIRCUITPY-CHANGE: Try and automount the SD card.
+        #if CIRCUITPY_SDCARDIO
+        automount_sd_card();
+        #endif
         for (mp_vfs_mount_t *vfs = MP_STATE_VM(vfs_mount_table); vfs != NULL; vfs = vfs->next) {
             size_t len = vfs->len - 1;
             if (len == 0) {
@@ -367,8 +376,18 @@ mp_obj_t mp_vfs_getcwd(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(mp_vfs_getcwd_obj, mp_vfs_getcwd);
 
-// CIRCUITPY-CHANGE: accessible from shared-module/os/__init__.c
-mp_obj_t mp_vfs_ilistdir_it_iternext(mp_obj_t self_in) {
+typedef struct _mp_vfs_ilistdir_it_t {
+    mp_obj_base_t base;
+    mp_fun_1_t iternext;
+    union {
+        mp_vfs_mount_t *vfs;
+        mp_obj_t iter;
+    } cur;
+    bool is_str;
+    bool is_iter;
+} mp_vfs_ilistdir_it_t;
+
+static mp_obj_t mp_vfs_ilistdir_it_iternext(mp_obj_t self_in) {
     mp_vfs_ilistdir_it_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->is_iter) {
         // continue delegating to root dir