Content-Length: 3197704 | pFad | https://github.com/relic-se/circuitpython/commit/b4698a5135f0d8b2275ef99d85c5842042b2c914

1C Merge branch 'main' into audiodelays_stereo_freq_shift_fix · relic-se/circuitpython@b4698a5 · GitHub
Skip to content

Commit b4698a5

Browse files
relic-serelic-se
authored
Merge branch 'main' into audiodelays_stereo_freq_shift_fix
2 parents f4b5a35 + 8ef2168 commit b4698a5

File tree

747 files changed

+122815
-3634
lines changed

Some content is hidden

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

747 files changed

+122815
-3634
lines changed

‎.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\//github.com/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" origen $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: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,18 @@ jobs:
7373
uses: actions/setup-python@v5
7474
with:
7575
python-version: 3.x
76+
- name: Board to port
77+
id: board-to-port
78+
run: |
79+
PORT=$(python tools/board_to_port.py "${{ inputs.board }}")
80+
echo "port=$PORT" >> $GITHUB_OUTPUT
81+
shell: bash
7682
- name: Set up port
7783
id: set-up-port
7884
uses: ./.github/actions/deps/ports
7985
with:
8086
board: ${{ inputs.board }}
87+
port: ${{ steps.board-to-port.outputs.port }}
8188
- name: Set up submodules
8289
id: set-up-submodules
8390
uses: ./.github/actions/deps/submodules
@@ -88,7 +95,7 @@ jobs:
8895
uses: ./.github/actions/deps/external
8996
with:
9097
action: cache
91-
port: ${{ steps.set-up-port.outputs.port }}
98+
port: ${{ steps.board-to-port.outputs.port }}
9299
- name: Set up mpy-cross
93100
if: steps.set-up-submodules.outputs.frozen == 'True'
94101
uses: ./.github/actions/mpy_cross
@@ -97,7 +104,7 @@ jobs:
97104
download: false
98105
- name: Versions
99106
run: |
100-
tools/describe
107+
python py/version.py
101108
gcc --version
102109
python3 --version
103110
cmake --version || true
@@ -115,9 +122,9 @@ jobs:
115122
FLAGS: ${{ inputs.flags }}
116123
DEBUG: ${{ inputs.debug && '1' || '0' }}
117124
run: make -j4 $FLAGS BOARD="$BOARD" DEBUG=$DEBUG TRANSLATION="$TRANSLATION"
118-
working-directory: ports/${{ steps.set-up-port.outputs.port }}
125+
working-directory: ports/${{ steps.board-to-port.outputs.port }}
119126
- name: Upload artifact
120127
uses: actions/upload-artifact@v4
121128
with:
122129
name: ${{ inputs.board }}-${{ inputs.language }}-${{ inputs.version }}${{ inputs.flags != '' && '-custom' || '' }}${{ inputs.debug && '-debug' || '' }}
123-
path: ports/${{ steps.set-up-port.outputs.port }}/build-${{ inputs.board }}/firmware.*
130+
path: ports/${{ steps.board-to-port.outputs.port }}/build-${{ inputs.board }}/firmware.*

‎.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 }}

‎.gitmodules

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@
312312
[submodule "ports/raspberrypi/lib/lwip"]
313313
path = ports/raspberrypi/lib/lwip
314314
url = https://github.com/adafruit/lwip.git
315-
branch = circuitpython8
315+
branch = circuitpython9
316316
[submodule "lib/mbedtls"]
317317
path = lib/mbedtls
318318
url = https://github.com/ARMmbed/mbedtls.git
@@ -346,6 +346,7 @@
346346
[submodule "ports/raspberrypi/lib/Pico-PIO-USB"]
347347
path = ports/raspberrypi/lib/Pico-PIO-USB
348348
url = https://github.com/adafruit/Pico-PIO-USB.git
349+
branch = main
349350
[submodule "lib/micropython-lib"]
350351
path = lib/micropython-lib
351352
url = https://github.com/micropython/micropython-lib.git

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

‎Makefile

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,30 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(BASEOPTS)
4040
# the i18n builder cannot share the environment and doctrees with the others
4141
I18NSPHINXOPTS = $(BASEOPTS)
4242

43-
TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/analog ports/cxd56 ports/espressif ports/mimxrt10xx ports/nordic ports/raspberrypi ports/renode ports/stm py shared-bindings shared-module supervisor
43+
TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/analog ports/cxd56 ports/espressif ports/mimxrt10xx ports/nordic ports/raspberrypi ports/renode ports/stm ports/zephyr-cp py shared-bindings shared-module supervisor
4444
# Paths to exclude from TRANSLATE_SOURCES
4545
# Each must be preceded by "-path"; if any wildcards, enclose in quotes.
4646
# Separate by "-o" (Find's "or" operand)
4747
TRANSLATE_SOURCES_EXC = -path "ports/*/build-*" \
4848
-o -path "ports/*/build" \
49+
-o -path ports/analog/msdk \
4950
-o -path ports/atmel-samd/asf4 \
5051
-o -path ports/cxd56/spresense-exported-sdk \
52+
-o -path ports/espressif/esp-camera \
5153
-o -path ports/espressif/esp-idf \
54+
-o -path ports/espressif/esp-protocols \
5255
-o -path ports/mimxrt10xx/sdk \
56+
-o -path ports/nordic/bluetooth \
57+
-o -path ports/nordic/nrfx \
58+
-o -path ports/raspberrypi/lib \
5359
-o -path ports/raspberrypi/sdk \
60+
-o -path ports/stm/peripherals \
5461
-o -path ports/stm/st_driver \
55-
-o -path lib/tinyusb \
56-
-o -path lib/lwip \
62+
-o -path ports/zephyr-cp/bootloader \
63+
-o -path ports/zephyr-cp/modules \
64+
-o -path ports/zephyr-cp/tools \
65+
-o -path ports/zephyr-cp/zephyr \
66+
-o -path lib \
5767
-o -path extmod/ulab/circuitpython \
5868
-o -path extmod/ulab/micropython \
5969

@@ -265,9 +275,8 @@ stubs:
265275
@mkdir circuitpython-stubs
266276
@$(PYTHON) tools/extract_pyi.py shared-bindings/ $(STUBDIR)
267277
@$(PYTHON) tools/extract_pyi.py extmod/ulab/code/ $(STUBDIR)/ulab
268-
@$(PYTHON) tools/extract_pyi.py ports/atmel-samd/bindings $(STUBDIR)
269-
@$(PYTHON) tools/extract_pyi.py ports/espressif/bindings $(STUBDIR)
270-
@$(PYTHON) tools/extract_pyi.py ports/raspberrypi/bindings $(STUBDIR)
278+
@for d in ports/*/bindings; do \
279+
$(PYTHON) tools/extract_pyi.py "$$d" $(STUBDIR); done
271280
@sed -e "s,__version__,`python -msetuptools_scm`," < setup.py-stubs > circuitpython-stubs/setup.py
272281
@cp README.rst-stubs circuitpython-stubs/README.rst
273282
@cp MANIFEST.in-stubs circuitpython-stubs/MANIFEST.in

0 commit comments

Comments
 (0)








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: https://github.com/relic-se/circuitpython/commit/b4698a5135f0d8b2275ef99d85c5842042b2c914

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy