christopherwun · May 31, 2025 · May 31, 2025 · May 31, 2025 · May 31, 2025 · Jun 2, 2025
diff --git a/.codespell/exclude-file.txt b/.codespell/exclude-file.txt
@@ -5,3 +5,7 @@ USB_PRODUCT = "BLOK"
 print(binascii.b2a_base64(b"fo"))
         # again, neither will "there" or "wither", since they have "the"
 i1Qb$TE"rl
+ZEN = "the zen of python beautiful is better than ugly explicit is better than implicit simple is better than complex complex is better than complicated flat is better than nested sparse is better than dense readability counts special cases arent special enough to break the rules although practicality beats purity errors should never pass silently unless explicitly silenced in the face of ambiguity refuse the temptation to guess there should be one and preferably only one obvious way to do it although that way may not be obvious at first unless youre dutch now is better than never although never is often better than right now if the implementation is hard to explain its a bad idea if the implementation is easy to explain it may be a good idea namespaces are one honking great idea  lets do more of those"
+    "arent",
+    "youre",
+USB_MANUFACTURER = "Wee Noise Makers"
diff --git a/.codespell/ignore-words.txt b/.codespell/ignore-words.txt
@@ -26,3 +26,4 @@ ftbfs
 straightaway
 ftbs
 ftb
+curren
diff --git a/.devcontainer/add_kitware_archive.sh b/.devcontainer/add_kitware_archive.sh
@@ -0,0 +1,107 @@
+#!/bin/sh
+# -----------------------------------------------------------------------------
+# This script is from: https://apt.kitware.com/kitware-archive.sh
+#
+# It installs key and repo for the kitware CMAKE-archive.
+#
+# Author: Bernhard Bablok
+#
+# -----------------------------------------------------------------------------
+
+set -eu
+
+help() {
+  echo "Usage: $0 [--release <ubuntu-release>] [--rc]" > /dev/stderr
+}
+
+doing=
+rc=
+release=
+help=
+for opt in "$@"
+do
+  case "${doing}" in
+  release)
+    release="${opt}"
+    doing=
+    ;;
+  "")
+    case "${opt}" in
+    --rc)
+      rc=1
+      ;;
+    --release)
+      doing=release
+      ;;
+    --help)
+      help=1
+      ;;
+    esac
+    ;;
+  esac
+done
+
+if [ -n "${doing}" ]
+then
+  echo "--${doing} option given no argument." > /dev/stderr
+  echo > /dev/stderr
+  help
+  exit 1
+fi
+
+if [ -n "${help}" ]
+then
+  help
+  exit
+fi
+
+if [ -z "${release}" ]
+then
+  unset UBUNTU_CODENAME
+  . /etc/os-release
+
+  if [ -z "${UBUNTU_CODENAME+x}" ]
+  then
+    echo "This is not an Ubuntu system. Aborting." > /dev/stderr
+    exit 1
+  fi
+
+  release="${UBUNTU_CODENAME}"
+fi
+
+case "${release}" in
+noble|jammy|focal)
+  packages=
+  keyring_packages="ca-certificates gpg wget"
+  ;;
+*)
+  echo "Only Ubuntu Noble (24.04), Jammy (22.04), and Focal (20.04) are supported. Aborting." > /dev/stderr
+  exit 1
+  ;;
+esac
+
+get_keyring=
+if [ ! -f /usr/share/doc/kitware-archive-keyring/copyright ]
+then
+  packages="${packages} ${keyring_packages}"
+  get_keyring=1
+fi
+
+# Start the real work
+set -x
+
+apt-get update
+# shellcheck disable=SC2086
+apt-get install -y ${packages}
+
+test -n "${get_keyring}" && (wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - > /usr/share/keyrings/kitware-archive-keyring.gpg)
+
+echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ ${release} main" > /etc/apt/sources.list.d/kitware.list
+if [ -n "${rc}" ]
+then
+  echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ ${release}-rc main" >> /etc/apt/sources.list.d/kitware.list
+fi
+
+apt-get update
+test -n "${get_keyring}" && rm /usr/share/keyrings/kitware-archive-keyring.gpg
+apt-get install -y kitware-archive-keyring
diff --git a/.devcontainer/common_tools.sh b/.devcontainer/common_tools.sh
@@ -15,6 +15,11 @@ cd "$REPO_ROOT"
 
 # --- repositories and tools   ------------------------------------------------
 
+echo -e "[common_tools.sh] adding kitware-archive (for current CMAKE)"
+sudo .devcontainer/add_kitware_archive.sh
+echo -e "[common_tools.sh] installing current version of CMAKE"
+sudo apt-get -y install cmake
+
 echo -e "[common_tools.sh] adding pybricks/ppa"
 sudo add-apt-repository -y ppa:pybricks/ppa
 echo -e "[common_tools.sh] installing uncrustify and mtools"

diff --git a/.devcontainer/cortex-m-toolchain.sh b/.devcontainer/cortex-m-toolchain.sh
@@ -14,10 +14,10 @@ echo -e "[cortex-m-toolchain.sh] downloading and installing gcc-arm-non-eabi too
 cd /workspaces
 
 wget -qO gcc-arm-none-eabi.tar.xz \
-  https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz
+  https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi.tar.xz
 
 tar -xJf gcc-arm-none-eabi.tar.xz
-ln -s arm-gnu-toolchain-13.2.Rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
+ln -s arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
 rm -f gcc-arm-none-eabi.tar.xz
 
 echo -e "[cortex-m-toolchain.sh] update PATH in environment"

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,3 +1,15 @@
+# all: Prune trailing whitespace.
+dda9b9c6da5d3c31fa8769e581a753e95a270803
+
+# all: Remove the "STATIC" macro and just use "static" instead.
+decf8e6a8bb940d5829ca3296790631fcece7b21
+
+# renesas-ra: Fix spelling mistakes found by codespell.
+b3f2f18f927fa2fad10daf63d8c391331f5edf58
+
+# all: Update Python formatting to ruff-format.
+bbd8760bd9a2302e5abee29db279102bb11d7732
+
 # all: Fix various spelling mistakes found by codespell 2.2.6.
 cf490a70917a1b2d38ba9b58e763e0837d0f7ca7
 

diff --git a/.gitattributes b/.gitattributes
@@ -10,12 +10,15 @@
 *.props text eol=crlf
 *.bat text eol=crlf
 
+# CIRCUITPY-CHANGE: add some more binary types.
 # These are binary so should never be modified by git.
 *.a binary
+*.ico binary
 *.png binary
 *.jpg binary
 *.dxf binary
 *.mpy binary
+*.der binary
 *.deb binary
 *.zip binary
 *.pdf binary
@@ -24,11 +27,4 @@
 # These should also not be modified by git.
 tests/basics/string_cr_conversion.py -text
 tests/basics/string_crlf_conversion.py -text
-ports/stm32/pybcdc.inf_template -text
-ports/stm32/usbhost/** -text
-ports/cc3200/hal/aes.c -text
-ports/cc3200/hal/aes.h -text
-ports/cc3200/hal/des.c -text
-ports/cc3200/hal/i2s.c -text
-ports/cc3200/hal/i2s.h -text
-ports/cc3200/version.h -text
+# CIRCUITPY-CHANGE: remove non-CircuitPython tests
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,20 +1,20 @@
 name: 🐞 Bug Report
-description: Create a bug report to help us improve
+description: Create a bug report to help us improve CircuitPython
 labels:
   - bug
 body:
   - type: markdown
     attributes:
       value: >-
         Thanks for testing out CircuitPython! Now that you have encountered a
-        bug... you can file a report for it.
+        bug, you can file a report for it.
   - type: textarea
     id: firmware
     attributes:
-      label: CircuitPython version
+      label: CircuitPython version and board name
       description: >-
-        Include the version of CircuitPython you're running. You can see it in
-        the `boot_out.txt` file, as well as in the `REPL`.
+        Include the version of CircuitPython you're running and the name of the board you're using.
+        You can find this information 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:
@@ -23,7 +23,7 @@ body:
     id: code
     attributes:
       label: Code/REPL
-      description: This is automatically rendered as Python, so no need for backticks.
+      description: Code here is automatically rendered as Python, so you don't need to include backticks.
       placeholder: |
         import busio, bitbangio
         i2c = bitbangio.I2C(board.GP1, board.GP0)

diff --git a/.github/actions/deps/external/action.yml b/.github/actions/deps/external/action.yml
@@ -22,11 +22,12 @@ runs:
       if: >-
         inputs.port != 'none' &&
         inputs.port != 'litex' &&
-        inputs.port != 'espressif'
+        inputs.port != 'espressif' &&
+        inputs.port != 'zephyr-cp'
       uses: carlosperate/arm-none-eabi-gcc-action@v1
       with:
         # When changing this update what Windows grabs too!
-        release: '13.2.Rel1'
+        release: '14.2.Rel1'
 
     # espressif
     - name: Get espressif toolchain
@@ -51,7 +52,7 @@ runs:
 
     # common
     - name: Cache python dependencies
-      if: inputs.port != 'espressif'
+      if: inputs.port != 'espressif' && inputs.port != 'zephyr-cp'
       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
@@ -4,33 +4,29 @@ inputs:
   board:
     required: true
     type: string
-
-outputs:
   port:
-    value: ${{ steps.board-to-port.outputs.port }}
+    required: true
+    type: string
 
 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 broadcom
-      if: steps.board-to-port.outputs.port == 'broadcom'
+      if: inputs.port == 'broadcom'
       uses: ./.github/actions/deps/ports/broadcom
 
     - name: Set up espressif
-      if: steps.board-to-port.outputs.port == 'espressif'
+      if: inputs.port == 'espressif'
       uses: ./.github/actions/deps/ports/espressif
 
     - name: Set up litex
-      if: steps.board-to-port.outputs.port == 'litex'
+      if: inputs.port == 'litex'
       uses: ./.github/actions/deps/ports/litex
 
     - name: Set up nordic
-      if: steps.board-to-port.outputs.port == 'nordic'
+      if: inputs.port == 'nordic'
       uses: ./.github/actions/deps/ports/nordic
+
+    - name: Set up Zephyr
+      if: inputs.port == 'zephyr-cp'
+      uses: ./.github/actions/deps/ports/zephyr-cp
diff --git 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-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-14.2.rel1-x86_64-aarch64-none-elf.tar.xz
+        sudo tar -C /usr --strip-components=1 -xaf arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-elf.tar.xz
         sudo apt-get update
         sudo apt-get install -y mtools
       shell: bash

diff --git a/.github/actions/deps/ports/espressif/action.yml b/.github/actions/deps/ports/espressif/action.yml
@@ -7,6 +7,7 @@ runs:
       run: |
         echo >> $GITHUB_ENV "IDF_PATH=$GITHUB_WORKSPACE/ports/espressif/esp-idf"
         echo >> $GITHUB_ENV "IDF_TOOLS_PATH=$GITHUB_WORKSPACE/.idf_tools"
+        echo >> $GITHUB_ENV "ESP_ROM_ELF_DIR=$GITHUB_WORKSPACE/.idf_tools"
       shell: bash
 
     - name: Get IDF commit

diff --git a/.github/actions/deps/ports/nordic/action.yml b/.github/actions/deps/ports/nordic/action.yml
@@ -5,7 +5,7 @@ runs:
   steps:
     - name: Get nrfutil 7+
       run: |
-        wget https://developer.nordicsemi.com/.pc-tools/nrfutil/x64-linux/nrfutil
+        wget https://files.nordicsemi.com/artifactory/swtools/external/nrfutil/executables/x86_64-unknown-linux-gnu/nrfutil
         chmod +x nrfutil
         ./nrfutil install nrf5sdk-tools
         mkdir -p $HOME/.local/bin

diff --git a/.github/actions/deps/ports/zephyr-cp/action.yml b/.github/actions/deps/ports/zephyr-cp/action.yml
@@ -0,0 +1,15 @@
+name: Fetch Zephyr port deps
+
+runs:
+  using: composite
+  steps:
+    - name: Setup Zephyr project
+      uses: zephyrproject-rtos/action-zephyr-setup@v1
+      with:
+        app-path: zephyr-config
+        base-path: ports/zephyr-cp
+        toolchains: arm-zephyr-eabi
+    - name: Export cmake info
+      run: west zephyr-export
+      shell: bash
+      working-directory: ports/zephyr-cp
diff --git a/.github/actions/deps/submodules/action.yml b/.github/actions/deps/submodules/action.yml
@@ -22,7 +22,7 @@ inputs:
     - restore
 
   version:
-    description: 'Whether to generate CP version'
+    description: 'Whether to fetch tags to identify CP version'
     required: false
     default: false
     type: boolean
@@ -80,7 +80,7 @@ runs:
         git fetch --no-recurse-submodules --shallow-since="2021-07-01" origin $GITHUB_SHA
         git repack -d
         echo "::endgroup::"
-        CP_VERSION=$(tools/describe)
+        CP_VERSION=$(python py/version.py)
         echo "$CP_VERSION"
         echo "CP_VERSION=$CP_VERSION" >> $GITHUB_ENV
         echo "cp-version=$CP_VERSION" >> $GITHUB_OUTPUT

diff --git a/.github/actions/upload_aws/action.yml b/.github/actions/upload_aws/action.yml
@@ -20,8 +20,11 @@ runs:
   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'))
+        (github.event_name == 'push' && github.repository_owner == 'adafruit') &&
+         (github.ref == 'refs/heads/main' ||
+          (startswith(github.ref, 'refs/heads/') && endswith(github.ref, '.x'))) ||
+        (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 }}

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,10 @@
+Thanks for submitting a pull request to CircuitPython! Remove these instructions before submitting.
+
+ See https://learn.adafruit.com/contribute-to-circuitpython-with-git-and-github for detailed instructions.
+
+- Consider whether to submit this PR against `main` or against (if it exists) the branch for the current stable release or an upcoming minor release. The branch will be named `i.j.x`, for example, `9.2.x`. Bug fixes and minor enhancements can be submitted against the stable release branch, and will be merged to `main` regularly.
+- Create your own fork of `circuitpython` and create a branch for your changes.
+- Use `pre-commit` to check your commits before submitting. See https://learn.adafruit.com/contribute-to-circuitpython-with-git-and-github/check-your-code.
+- Test your changes and tell us how you tested.
+
+---
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,3 +26,4 @@ ftbfs @@
     straightaway
     ftbs
     ftb
+    curren