8000 Merge branch 'main' into audiodelays_mix_fix · adafruit/circuitpython@8f9843e · GitHub
[go: up one dir, main page]
Skip to content

Commit 8f9843e

Browse files
relic-serelic-se
authored
Merge branch 'main' into audiodelays_mix_fix
2 parents 8d5219f + dabb0aa commit 8f9843e

File tree

601 files changed

+14529
-2429
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

601 files changed

+14529
-2429
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
name: 🐞 Bug Report
2-
description: Create a bug report to help us improve
2+
description: Create a bug report to help us improve CircuitPython
33
labels:
44
- bug
55
body:
66
- type: markdown
77
attributes:
88
value: >-
99
Thanks for testing out CircuitPython! Now that you have encountered a
10-
bug... you can file a report for it.
10+
bug, you can file a report for it.
1111
- type: textarea
1212
id: firmware
1313
attributes:
14-
label: CircuitPython version
14+
label: CircuitPython version and board name
1515
description: >-
16-
Include the version of CircuitPython you're running. You can see it in
17-
the `boot_out.txt` file, as well as in the `REPL`.
16+
Include the version of CircuitPython you're running and the name of the board you're using.
17+
You can find this information in the `boot_out.txt` file, as well as in the REPL.
1818
placeholder: Adafruit CircuitPython 6.2.0 on 2021-03-01; Raspberry Pi Pico with rp2040
1919
render: python
2020
validations:
@@ -23,7 +23,7 @@ body:
2323
id: code
2424
attributes:
2525
label: Code/REPL
26-
description: This is automatically rendered as Python, so no need for backticks.
26+
description: Code here is automatically rendered as Python, so you don't need to include backticks.
2727
placeholder: |
2828
import busio, bitbangio
2929
i2c = bitbangio.I2C(board.GP1, board.GP0)

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ runs:
2222
if: >-
2323
inputs.port != 'none' &&
2424
inputs.port != 'litex' &&
25-
inputs.port != 'espressif'
25+
inputs.port != 'espressif' &&
26+
inputs.port != 'zephyr-cp'
2627
uses: carlosperate/arm-none-eabi-gcc-action@v1
2728
with:
2829
# When changing this update what Windows grabs too!
@@ -51,7 +52,7 @@ runs:
5152

5253
# common
5354
- name: Cache python dependencies
54-
if: inputs.port != 'espressif'
55+
if: inputs.port != 'espressif' && inputs.port != 'zephyr-cp'
5556
uses: ./.github/actions/deps/python
5657
with:
5758
action: ${{ inputs.action }}

‎.github/actions/deps/ports/action.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,29 @@ inputs:
44
board:
55
required: true
66
type: string
7-
8-
outputs:
97
port:
10-
value: ${{ steps.board-to-port.outputs.port }}
8+
required: true
9+
type: string
1110

1211
runs:
1312
using: composite
1413
steps:
15-
- name: Board to port
16-
id: board-to-port
17-
run: |
18-
PORT=$(find ports/*/boards/ -type d -name ${{ inputs.board }} | sed 's/^ports\///g;s/\/boards.*//g')
19-
if [ -z $PORT ]; then (exit 1); else echo >> $GITHUB_OUTPUT "port=$PORT"; fi
20-
shell: bash
21-
2214
- name: Set up broadcom
23-
if: steps.board-to-port.outputs.port == 'broadcom'
15+
if: inputs.port == 'broadcom'
2416
uses: ./.github/actions/deps/ports/broadcom
2517

2618
- name: Set up espressif
27-
if: steps.board-to-port.outputs.port == 'espressif'
19+
if: inputs.port == 'espressif'
2820
uses: ./.github/actions/deps/ports/espressif
2921

3022
- name: Set up litex
31-
if: steps.board-to-port.outputs.port == 'litex'
23+
if: inputs.port == 'litex'
3224
uses: ./.github/actions/deps/ports/litex
3325

3426
- name: Set up nordic
35-
if: steps.board-to-port.outputs.port == 'nordic'
27+
if: inputs.port == 'nordic'
3628
uses: ./.github/actions/deps/ports/nordic
29+
30+
- name: Set up Zephyr
31+
if: inputs.port == 'zephyr-cp'
32+
uses: ./.github/actions/deps/ports/zephyr-cp

‎.github/actions/deps/ports/zephyr-cp/action.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Fetch Zephyr port deps
2+
3+
runs:
4+
using: composite
5+
steps:
6+
- name: Setup Zephyr project
7+
uses: zephyrproject-rtos/action-zephyr-setup@v1
8+
with:
9+
app-path: zephyr-config
10+
base-path: ports/zephyr-cp
11+
toolchains: arm-zephyr-eabi
12+
- name: Export cmake info
13+
run: west zephyr-export
14+
shell: bash
15+
working-directory: ports/zephyr-cp

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ runs:
8080
git fetch --no-recurse-submodules --shallow-since="2021-07-01" origin $GITHUB_SHA
8181
git repack -d
8282
echo "::endgroup::"
83-
CP_VERSION=$(tools/describe)
83+
CP_VERSION=$(python py/version.py)
8484
echo "$CP_VERSION"
8585
echo "CP_VERSION=$CP_VERSION" >> $GITHUB_ENV
8686
echo "cp-version=$CP_VERSION" >> $GITHUB_OUTPUT

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
download: false
9898
- name: Versions
9999
run: |
100-
tools/describe
100+
python py/version.py
101101
gcc --version
102102
python3 --version
103103
cmake --version || true

‎.github/workflows/build-boards.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ on:
99
cp-version:
1010
required: true
1111
type: string
12+
port:
13+
required: true
14+
type: string
1215
secrets:
1316
AWS_ACCESS_KEY_ID:
1417
required: false
@@ -43,6 +46,7 @@ jobs:
4346
uses: ./.github/actions/deps/ports
4447
with:
4548
board: ${{ matrix.board }}
49+
port: ${{ inputs.port }}
4650

4751
- name: Set up submodules
4852
id: set-up-submodules
@@ -51,7 +55,7 @@ jobs:
5155
- name: Set up external
5256
uses: ./.github/actions/deps/external
5357
with:
54-
port: ${{ steps.set-up-port.outputs.port }}
58+
port: ${{ inputs.port }}
5559
- name: Set up mpy-cross
5660
if: steps.set-up-submodules.outputs.frozen == 'True'
5761
uses: ./.github/actions/mpy_cross

‎.github/workflows/build.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,35 @@ jobs:
299299
# ERROR: Platform MINGW64_NT-10.0-17763-x86_64 appears to be unsupported
300300
# https://github.com/espressif/esp-idf/issues/7062
301301

302+
windows-zephyr:
303+
strategy:
304+
matrix:
305+
os: [windows-2022, windows-2025]
306+
runs-on: ${{ matrix.os }}
307+
needs: scheduler
308+
if: needs.scheduler.outputs.windows == 'True'
309+
env:
310+
CP_VERSION: ${{ needs.scheduler.outputs.cp-version }}
311+
steps:
312+
- name: Set up repository
313+
uses: actions/checkout@v4
314+
with:
315+
submodules: false
316+
show-progress: false
317+
fetch-depth: 1
318+
persist-credentials: false
319+
- uses: actions/setup-python@v5
320+
with:
321+
python-version: '3.13'
322+
- name: Set up Zephyr
323+
uses: ./.github/actions/deps/ports/zephyr-cp
324+
- name: Set up submodules
325+
uses: ./.github/actions/deps/submodules
326+
- name: build mpy-cross
327+
run: make -j4 -C mpy-cross
328+
- name: build ek_ra8d1
329+
run: make -j4 -C ports/zephyr-cp BOARD=renesas_ek_ra8d1
330+
302331
ports:
303332
needs: [scheduler, mpy-cross, tests]
304333
if: needs.scheduler.outputs.ports != '{}'
@@ -311,3 +340,4 @@ jobs:
311340
with:
312341
boards: ${{ toJSON(fromJSON(needs.scheduler.outputs.ports)[matrix.port]) }}
313342
cp-version: ${{ needs.scheduler.outputs.cp-version }}
343+
port: ${{ matrix.port }}

‎.pre-commit-config.yaml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
repos:
88
- repo: https://github.com/pre-commit/pre-commit-hooks
9-
rev: v4.0.1
9+
rev: v5.0.0
1010
hooks:
1111
- id: check-yaml
1212
- id: end-of-file-fixer
@@ -25,7 +25,8 @@ repos:
2525
tests/unicode/data/utf-8_invalid.txt|
2626
tests/extmod/data/qr.pgm|
2727
tests/basics/bytearray_byte_operations.py|
28-
ports/raspberrypi/sdk
28+
ports/raspberrypi/sdk|
29+
ports/zephyr-cp/cptools/compat2driver.py
2930
)
3031
- repo: local
3132
hooks:
@@ -38,10 +39,23 @@ repos:
3839
- id: formatting
3940
name: Formatting
4041
entry: python3 tools/codeformat.py
41-
types_or: [c, python]
42+
types: [c]
4243
language: system
4344
exclude: |
4445
(?x)^(
4546
lib/tinyusb|
4647
ports/raspberrypi/sdk
4748
)
49+
- repo: https://github.com/astral-sh/ruff-pre-commit
50+
# Ruff version.
51+
rev: v0.9.4
52+
hooks:
53+
# Run the linter.
54+
- id: ruff
55+
args: [ --fix ]
56+
# Run the formatter.
57+
- id: ruff-format
58+
- repo: https://github.com/tox-dev/pyproject-fmt
59+
rev: "v2.5.0"
60+
hooks:
61+
- id: pyproject-fmt

0 commit comments

Comments
 (0)
0