Skip to content

Commit 86ddecf

Browse files
jpconstantineaujpconstantineau
committed
merge main and resolve conflict
2 parents dac71e6 + b504432 commit 86ddecf

File tree

521 files changed

+13677
-903
lines changed

Some content is hidden

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

521 files changed

+13677
-903
lines changed

‎.github/workflows/build.yml

Lines changed: 94 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
boards-arm: ${{ steps.set-matrix.outputs.boards-arm }}
2121
boards-riscv: ${{ steps.set-matrix.outputs.boards-riscv }}
2222
boards-espressif: ${{ steps.set-matrix.outputs.boards-espressif }}
23+
boards-aarch: ${{ steps.set-matrix.outputs.boards-aarch }}
2324
steps:
2425
- name: Dump GitHub context
2526
env:
@@ -28,19 +29,17 @@ jobs:
2829
- uses: actions/[email protected]
2930
with:
3031
submodules: false
31-
fetch-depth: 0
32-
- name: Populate selected submodules
33-
run: git submodule update --init extmod/ lib/ tools/
34-
- name: Fetch tags
35-
run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
36-
- name: CircuitPython version
37-
run: |
38-
git describe --dirty --tags
39-
echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
32+
fetch-depth: 1
4033
- name: Set up Python 3.8
4134
uses: actions/setup-python@v1
4235
with:
4336
python-version: 3.8
37+
- name: Get CP deps
38+
run: python tools/ci_fetch_deps.py test ${{ github.sha }}
39+
- name: CircuitPython version
40+
run: |
41+
git describe --dirty --tags || git log --parents HEAD~4..
42+
echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
4443
- name: Install dependencies
4544
run: |
4645
sudo apt-get update
@@ -136,19 +135,17 @@ jobs:
136135
- uses: actions/[email protected]
137136
with:
138137
submodules: false
139-
fetch-depth: 0
140-
- name: Populate selected submodules
141-
run: git submodule update --init extmod/ lib/ tools/
142-
- name: Fetch tags
143-
run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
144-
- name: CircuitPython version
145-
run: |
146-
git describe --dirty --tags
147-
echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
138+
fetch-depth: 1
148139
- name: Set up Python 3.8
149140
uses: actions/setup-python@v1
150141
with:
151142
python-version: 3.8
143+
- name: Get CP deps
144+
run: python tools/ci_fetch_deps.py mpy-cross-mac ${{ github.sha }}
145+
- name: CircuitPython version
146+
run: |
147+
git describe --dirty --tags
148+
echo >>$GITHUB_ENV CP_VERSION=$(git describe --dirty --tags)
152149
- name: Install dependencies
153150
run: |
154151
brew install gettext
@@ -198,11 +195,9 @@ jobs:
198195
- uses: actions/[email protected]
199196
with:
200197
submodules: false
201-
fetch-depth: 0
202-
- name: Populate selected submodules
203-
run: git submodule update --init extmod/
204-
- name: Fetch tags
205-
run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
198+
fetch-depth: 1
199+
- name: Get CP deps
200+
run: python tools/ci_fetch_deps.py docs ${{ github.sha }}
206201
- name: CircuitPython version
207202
run: |
208203
git describe --dirty --tags
@@ -271,10 +266,10 @@ jobs:
271266
python-version: 3.8
272267
- uses: actions/[email protected]
273268
with:
274-
submodules: true
275-
fetch-depth: 0
276-
- name: Fetch tags
277-
run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
269+
submodules: false
270+
fetch-depth: 1
271+
- name: Get CP deps
272+
run: python tools/ci_fetch_deps.py ${{ matrix.board }} ${{ github.sha }}
278273
- name: Install dependencies
279274
run: |
280275
sudo apt-get install -y gettext
@@ -323,10 +318,10 @@ jobs:
323318
python-version: 3.8
324319
- uses: actions/[email protected]
325320
with:
326-
submodules: true
327-
fetch-depth: 0
328-
- name: Fetch tags
329-
run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
321+
submodules: false
322+
fetch-depth: 1
323+
- name: Get CP deps
324+
run: python tools/ci_fetch_deps.py ${{ matrix.board }} ${{ github.sha }}
330325
- name: Install dependencies
331326
run: |
332327
sudo apt-get install -y gettext
@@ -375,10 +370,10 @@ jobs:
375370
python-version: 3.8
376371
- uses: actions/[email protected]
377372
with:
378-
submodules: true
379-
fetch-depth: 0
380-
- name: Fetch tags
381-
run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
373+
submodules: false
374+
fetch-depth: 1
375+
- name: Get CP deps
376+
run: python tools/ci_fetch_deps.py ${{ matrix.board }} ${{ github.sha }}
382377
- name: CircuitPython version
383378
run: git describe --dirty --tags
384379
- uses: actions/cache@v2
@@ -446,3 +441,67 @@ jobs:
446441
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
447442
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
448443
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'))
444+
445+
build-aarch:
446+
runs-on: ubuntu-20.04
447+
needs: test
448+
strategy:
449+
fail-fast: false
450+
matrix:
451+
board: ${{ fromJSON(needs.test.outputs.boards-aarch) }}
452+
if: ${{ needs.test.outputs.boards-aarch != '[]' }}
453+
steps:
454+
- name: Set up Python 3.8
455+
uses: actions/setup-python@v1
456+
with:
457+
python-version: 3.8
458+
- uses: actions/[email protected]
459+
with:
460+
submodules: false
461+
fetch-depth: 1
462+
- name: Get CP deps
463+
run: python tools/ci_fetch_deps.py ${{ matrix.board }} ${{ github.sha }}
464+
- name: Install dependencies
465+
run: |
466+
sudo apt-get install -y gettext mtools
467+
pip install -r requirements-ci.txt -r requirements-dev.txt
468+
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
469+
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
470+
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
471+
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
472+
- name: Install mkfs.fat
473+
run: |
474+
wget https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz
475+
tar -xaf dosfstools-4.2.tar.gz
476+
cd dosfstools-4.2
477+
./configure
478+
make -j 2
479+
cd src
480+
echo >>$GITHUB_PATH $(pwd)
481+
- name: Versions
482+
run: |
483+
gcc --version
484+
aarch64-none-elf-gcc --version
485+
arm-none-eabi-gcc --version
486+
python3 --version
487+
mkfs.fat --version || true
488+
- name: mpy-cross
489+
run: make -C mpy-cross -j2
490+
- name: Setup build failure matcher
491+
run: echo "::add-matcher::$GITHUB_WORKSPACE/.github/workflows/match-build-fail.json"
492+
- name: build
493+
run: python3 -u build_release_files.py
494+
working-directory: tools
495+
env:
496+
BOARDS: ${{ matrix.board }}
497+
- uses: actions/upload-artifact@v2
498+
with:
499+
name: ${{ matrix.board }}
500+
path: bin/${{ matrix.board }}
501+
- name: Upload to S3
502+
run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
503+
env:
504+
AWS_PAGER: ''
505+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
506+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
507+
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/workflows/create_website_pr.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,21 @@ jobs:
1818
run: echo "$GITHUB_CONTEXT"
1919
- uses: actions/[email protected]
2020
with:
21-
submodules: true
22-
fetch-depth: 0
21+
submodules: false
22+
fetch-depth: 1
2323
- name: Set up Python 3.8
2424
uses: actions/setup-python@v1
2525
with:
2626
python-version: 3.8
27+
- name: Get CP deps
28+
run: python tools/ci_fetch_deps.py website ${{ github.sha }}
2729
- name: Install deps
2830
run: |
2931
pip install -r requirements-dev.txt
3032
- name: Versions
3133
run: |
3234
gcc --version
3335
python3 --version
34-
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
3536
- name: CircuitPython version
3637
run: git describe --dirty --tags
3738
- name: Website

‎.github/workflows/notify.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Notify users based on issue labels
2+
3+
on:
4+
issues:
5+
types: [labeled]
6+
7+
jobs:
8+
notify:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: jenschelkopf/[email protected]
12+
with:
13+
recipients: |
14+
ulab=@v923z

‎.github/workflows/ports_windows.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ jobs:
6565
which python; python --version; python -c "import cascadetoml"
6666
which python3; python3 --version; python3 -c "import cascadetoml"
6767
68-
- uses: actions/checkout@v2
68+
- uses: actions/checkout@v2.2.0
6969
with:
70-
submodules: true
71-
fetch-depth: 0
72-
73-
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
70+
submodules: false
71+
fetch-depth: 1
72+
- name: Get CP deps
73+
run: python tools/ci_fetch_deps.py windows ${{ github.sha }}
7474
- name: CircuitPython version
7575
run: |
7676
git describe --dirty --tags

‎.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
pre-commit:
1313
runs-on: ubuntu-20.04
1414
steps:
15-
- uses: actions/checkout@v1
15+
- uses: actions/checkout@v2.2.0
1616
- uses: actions/setup-python@v1
1717
- name: Install deps
1818
run: |

‎.gitmodules

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git
110110
[submodule "extmod/ulab"]
111111
path = extmod/ulab
112-
url = https://github.com/adafruit/circuitpython-ulab
112+
url = https://github.com/v923z/micropython-ulab
113113
[submodule "frozen/Adafruit_CircuitPython_ESP32SPI"]
114114
path = frozen/Adafruit_CircuitPython_ESP32SPI
115115
url = https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI
@@ -149,7 +149,7 @@
149149
[submodule "ports/espressif/esp-idf"]
150150
path = ports/espressif/esp-idf
151151
url = https://github.com/espressif/esp-idf.git
152-
branch = release/v4.3
152+
branch = release/v4.4
153153
[submodule "ports/espressif/certificates/nina-fw"]
154154
path = ports/espressif/certificates/nina-fw
155155
url = https://github.com/adafruit/nina-fw.git
@@ -190,3 +190,12 @@
190190
[submodule "frozen/Adafruit_CircuitPython_APDS9960"]
191191
path = frozen/Adafruit_CircuitPython_APDS9960
192192
url = https://github.com/adafruit/Adafruit_CircuitPython_APDS9960
193+
[submodule "ports/broadcom/peripherals"]
194+
path = ports/broadcom/peripherals
195+
url = https://github.com/adafruit/broadcom-peripherals.git
196+
branch = main-build
197+
[submodule "rpi-firmware"]
198+
path = ports/broadcom/firmware
199+
url = https://github.com/raspberrypi/rpi-firmware.git
200+
branch = master
201+
shallow = true

‎Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,3 +321,11 @@ clean-nrf:
321321

322322
clean-stm:
323323
$(MAKE) -C ports/stm BOARD=feather_stm32f405_express clean
324+
325+
.PHONY: fetch-submodules
326+
fetch-submodules:
327+
# This update will fail because the commits we need aren't the latest on the
328+
# branch. We can ignore that though because we fix it with the second command.
329+
# (Only works for git servers that allow sha fetches.)
330+
git submodule update --init -N --depth 1 || true
331+
git submodule foreach 'git fetch --tags --depth 1 origin $$sha1 && git checkout -q $$sha1'

‎README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ Supported Support status
213213
================ ============================================================
214214
atmel-samd ``SAMD21`` stable | ``SAMD51`` stable
215215
cxd56 stable
216-
espressif ``ESP32-C3`` beta | ``ESP32-S2`` stable
216+
espressif ``ESP32-C3`` beta | ``ESP32-S2`` stable | ``ESP32-S3`` beta
217217
litex alpha
218218
mimxrt10xx alpha
219219
nrf stable
@@ -229,7 +229,7 @@ unix alpha
229229
Boards
230230
~~~~~~
231231

232-
- Each ``port`` has a ``boards`` directory containing variations of boards
232+
- Each ``port`` has a ``boards`` directory containing boards
233233
which belong to a specific microcontroller line.
234234
- A list of native modules supported by a particular board can be found
235235
`here <https://circuitpython.readthedocs.io/en/latest/shared-bindings/support_matrix.html>`__.

‎conf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@ def autoapi_prepare_jinja_env(jinja_env):
186186
"ports/atmel-samd/peripherals",
187187
"ports/atmel-samd/QTouch",
188188
"ports/atmel-samd/tools",
189+
"ports/broadcom/firmware",
190+
"ports/broadcom/peripherals",
189191
"ports/cxd56/mkspk",
190192
"ports/cxd56/spresense-exported-sdk",
191193
"ports/espressif/certificates",

‎data/nvm.toml

0 commit comments

Comments
 (0)