Merge branch 'main' into i2sin

Author: relic-se

.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)

.github/actions/deps/external/action.yml

@@ -22,7 +22,8 @@ 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!
@@ -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 }}

.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

.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

.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

.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

.github/actions/deps/submodules/action.yml

@@ -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

.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.
+
+---

.github/workflows/build-board-custom.yml

@@ -73,11 +73,18 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: 3.x
+    - name: Board to port
+      id: board-to-port
+      run: |
+        PORT=$(python tools/board_to_port.py "${{ inputs.board }}")
+        echo "port=$PORT" >> $GITHUB_OUTPUT
+      shell: bash
     - name: Set up port
       id: set-up-port
       uses: ./.github/actions/deps/ports
       with:
         board: ${{ inputs.board }}
+        port: ${{ steps.board-to-port.outputs.port }}
     - name: Set up submodules
       id: set-up-submodules
       uses: ./.github/actions/deps/submodules
@@ -88,7 +95,7 @@ jobs:
       uses: ./.github/actions/deps/external
       with:
         action: cache
-        port: ${{ steps.set-up-port.outputs.port }}
+        port: ${{ steps.board-to-port.outputs.port }}
     - name: Set up mpy-cross
       if: steps.set-up-submodules.outputs.frozen == 'True'
       uses: ./.github/actions/mpy_cross
@@ -97,7 +104,7 @@ jobs:
         download: false
     - name: Versions
       run: |
-        tools/describe
+        python py/version.py
         gcc --version
         python3 --version
         cmake --version || true
@@ -115,9 +122,9 @@ jobs:
         FLAGS: ${{ inputs.flags }}
         DEBUG: ${{ inputs.debug && '1' || '0' }}
       run: make -j4 $FLAGS BOARD="$BOARD" DEBUG=$DEBUG TRANSLATION="$TRANSLATION"
-      working-directory: ports/${{ steps.set-up-port.outputs.port }}
+      working-directory: ports/${{ steps.board-to-port.outputs.port }}
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
         name: ${{ inputs.board }}-${{ inputs.language }}-${{ inputs.version }}${{ inputs.flags != '' && '-custom' || '' }}${{ inputs.debug && '-debug' || '' }}
-        path: ports/${{ steps.set-up-port.outputs.port }}/build-${{ inputs.board }}/firmware.*
+        path: ports/${{ steps.board-to-port.outputs.port }}/build-${{ inputs.board }}/firmware.*

.github/workflows/build-boards.yml

@@ -9,6 +9,9 @@ on:
       cp-version:
         required: true
         type: string
+      port:
+        required: true
+        type: string
     secrets:
       AWS_ACCESS_KEY_ID:
         required: false
@@ -43,6 +46,7 @@ jobs:
       uses: ./.github/actions/deps/ports
       with:
         board: ${{ matrix.board }}
+        port: ${{ inputs.port }}
 
     - name: Set up submodules
       id: set-up-submodules
@@ -51,7 +55,7 @@ jobs:
     - name: Set up external
       uses: ./.github/actions/deps/external
       with:
-        port: ${{ steps.set-up-port.outputs.port }}
+        port: ${{ inputs.port }}
     - name: Set up mpy-cross
       if: steps.set-up-submodules.outputs.frozen == 'True'
       uses: ./.github/actions/mpy_cross