Skip to content

Commit 851f8a1

Browse files
dhalbertdhalbert
committed
Merge remote-tracking branch 'adafruit/main' into HEAD
2 parents d875eb2 + ab4e048 commit 851f8a1

File tree

1,548 files changed

+43362
-23701
lines changed

Some content is hidden

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

1,548 files changed

+43362
-23701
lines changed

‎.github/workflows/build.yml

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ jobs:
3030
env:
3131
GITHUB_CONTEXT: ${{ toJson(github) }}
3232
run: echo "$GITHUB_CONTEXT"
33-
- uses: actions/checkout@v2.2.0
33+
- uses: actions/checkout@v3
3434
with:
3535
submodules: false
3636
fetch-depth: 1
3737
- name: Set up Python 3
38-
uses: actions/setup-python@v2
38+
uses: actions/setup-python@v4
3939
with:
4040
python-version: "3.x"
4141
- name: Get CP deps
@@ -92,25 +92,25 @@ jobs:
9292
working-directory: tests
9393
- name: Build mpy-cross.static-aarch64
9494
run: make -C mpy-cross -j2 -f Makefile.static-aarch64
95-
- uses: actions/upload-artifact@v2
95+
- uses: actions/upload-artifact@v3
9696
with:
9797
name: mpy-cross.static-aarch64
9898
path: mpy-cross/mpy-cross.static-aarch64
9999
- name: Build mpy-cross.static-raspbian
100100
run: make -C mpy-cross -j2 -f Makefile.static-raspbian
101-
- uses: actions/upload-artifact@v2
101+
- uses: actions/upload-artifact@v3
102102
with:
103103
name: mpy-cross.static-raspbian
104104
path: mpy-cross/mpy-cross.static-raspbian
105105
- name: Build mpy-cross.static
106106
run: make -C mpy-cross -j2 -f Makefile.static
107-
- uses: actions/upload-artifact@v2
107+
- uses: actions/upload-artifact@v3
108108
with:
109109
name: mpy-cross.static-amd64-linux
110110
path: mpy-cross/mpy-cross.static
111111
- name: Build mpy-cross.static-mingw
112112
run: make -C mpy-cross -j2 -f Makefile.static-mingw
113-
- uses: actions/upload-artifact@v2
113+
- uses: actions/upload-artifact@v3
114114
with:
115115
name: mpy-cross.static-x64-windows
116116
path: mpy-cross/mpy-cross.static.exe
@@ -143,18 +143,18 @@ jobs:
143143

144144

145145
mpy-cross-mac:
146-
runs-on: macos-10.15
146+
runs-on: macos-11
147147
steps:
148148
- name: Dump GitHub context
149149
env:
150150
GITHUB_CONTEXT: ${{ toJson(github) }}
151151
run: echo "$GITHUB_CONTEXT"
152-
- uses: actions/checkout@v2.2.0
152+
- uses: actions/checkout@v3
153153
with:
154154
submodules: false
155155
fetch-depth: 1
156156
- name: Set up Python 3
157-
uses: actions/setup-python@v2
157+
uses: actions/setup-python@v4
158158
with:
159159
python-version: "3.x"
160160
- name: Get CP deps
@@ -174,29 +174,27 @@ jobs:
174174
msgfmt --version
175175
- name: Build mpy-cross
176176
run: make -C mpy-cross -j2
177-
- uses: actions/upload-artifact@v2
177+
- uses: actions/upload-artifact@v3
178178
with:
179-
name: mpy-cross-macos-catalina
179+
name: mpy-cross-macos-11-x64
180180
path: mpy-cross/mpy-cross
181-
- name: Select SDK for M1 build
182-
run: sudo xcode-select -switch /Applications/Xcode_12.3.app
183181
- name: Build mpy-cross (arm64)
184182
run: make -C mpy-cross -j2 -f Makefile.m1 V=2
185-
- uses: actions/upload-artifact@v2
183+
- uses: actions/upload-artifact@v3
186184
with:
187-
name: mpy-cross-macos-bigsur-arm64
185+
name: mpy-cross-macos-11-arm64
188186
path: mpy-cross/mpy-cross-arm64
189187
- name: Make universal binary
190188
run: lipo -create -output mpy-cross-macos-universal mpy-cross/mpy-cross mpy-cross/mpy-cross-arm64
191-
- uses: actions/upload-artifact@v2
189+
- uses: actions/upload-artifact@v3
192190
with:
193-
name: mpy-cross-macos-universal
191+
name: mpy-cross-macos-11-universal
194192
path: mpy-cross-macos-universal
195193
- name: Upload mpy-cross build to S3
196194
run: |
197-
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-universal-${{ env.CP_VERSION }} --no-progress --region us-east-1
198-
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-bigsur-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
199-
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-catalina-${{ env.CP_VERSION }} --no-progress --region us-east-1
195+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-universal --no-progress --region us-east-1
196+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
197+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-x64 --no-progress --region us-east-1
200198
env:
201199
AWS_PAGER: ''
202200
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -209,7 +207,7 @@ jobs:
209207
needs: test
210208
if: ${{ needs.test.outputs.build-doc == 'True' }}
211209
steps:
212-
- uses: actions/checkout@v2.2.0
210+
- uses: actions/checkout@v3
213211
with:
214212
submodules: false
215213
fetch-depth: 1
@@ -220,7 +218,7 @@ jobs:
220218
tools/describe || git log --parents HEAD~4..
221219
echo >>$GITHUB_ENV CP_VERSION=$(tools/describe)
222220
- name: Set up Python 3
223-
uses: actions/setup-python@v2
221+
uses: actions/setup-python@v4
224222
with:
225223
python-version: "3.x"
226224
- name: Install dependencies
@@ -231,20 +229,20 @@ jobs:
231229
pip install -r requirements-ci.txt -r requirements-doc.txt
232230
- name: Build and Validate Stubs
233231
run: make check-stubs -j2
234-
- uses: actions/upload-artifact@v2
232+
- uses: actions/upload-artifact@v3
235233
with:
236234
name: stubs
237235
path: circuitpython-stubs/dist/*
238236
- name: Test Documentation Build (HTML)
239237
run: sphinx-build -E -W -b html -D version=${{ env.CP_VERSION }} -D release=${{ env.CP_VERSION }} . _build/html
240-
- uses: actions/upload-artifact@v2
238+
- uses: actions/upload-artifact@v3
241239
with:
242240
name: docs
243241
path: _build/html
244242
- name: Test Documentation Build (LaTeX/PDF)
245243
run: |
246244
make latexpdf
247-
- uses: actions/upload-artifact@v2
245+
- uses: actions/upload-artifact@v3
248246
with:
249247
name: docs
250248
path: _build/latex
@@ -278,21 +276,22 @@ jobs:
278276
if: ${{ needs.test.outputs.boards-arm != '[]' }}
279277
steps:
280278
- name: Set up Python 3
281-
uses: actions/setup-python@v2
279+
uses: actions/setup-python@v4
282280
with:
283281
python-version: "3.x"
284-
- uses: actions/checkout@v2.2.0
282+
- uses: actions/checkout@v3
285283
with:
286284
submodules: false
287285
fetch-depth: 1
288286
- name: Get CP deps
289287
run: python tools/ci_fetch_deps.py ${{ matrix.board }} ${{ github.sha }}
288+
- uses: carlosperate/arm-none-eabi-gcc-action@v1
289+
with:
290+
release: '10-2020-q4'
290291
- name: Install dependencies
291292
run: |
292293
sudo apt-get install -y gettext
293294
pip install -r requirements-ci.txt -r requirements-dev.txt
294-
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
295-
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
296295
- name: Versions
297296
run: |
298297
gcc --version
@@ -307,7 +306,7 @@ jobs:
307306
working-directory: tools
308307
env:
309308
BOARDS: ${{ matrix.board }}
310-
- uses: actions/upload-artifact@v2
309+
- uses: actions/upload-artifact@v3
311310
with:
312311
name: ${{ matrix.board }}
313312
path: bin/${{ matrix.board }}
@@ -330,10 +329,10 @@ jobs:
330329
if: ${{ needs.test.outputs.boards-riscv != '[]' }}
331330
steps:
332331
- name: Set up Python 3
333-
uses: actions/setup-python@v2
332+
uses: actions/setup-python@v4
334333
with:
335334
python-version: "3.x"
336-
- uses: actions/checkout@v2.2.0
335+
- uses: actions/checkout@v3
337336
with:
338337
submodules: false
339338
fetch-depth: 1
@@ -359,7 +358,7 @@ jobs:
359358
working-directory: tools
360359
env:
361360
BOARDS: ${{ matrix.board }}
362-
- uses: actions/upload-artifact@v2
361+
- uses: actions/upload-artifact@v3
363362
with:
364363
name: ${{ matrix.board }}
365364
path: bin/${{ matrix.board }}
@@ -382,10 +381,11 @@ jobs:
382381
if: ${{ needs.test.outputs.boards-espressif != '[]' }}
383382
steps:
384383
- name: Set up Python 3
385-
uses: actions/setup-python@v2
384+
id: py3
385+
uses: actions/setup-python@v4
386386
with:
387387
python-version: "3.x"
388-
- uses: actions/checkout@v2.2.0
388+
- uses: actions/checkout@v3
389389
with:
390390
submodules: false
391391
fetch-depth: 1
@@ -395,12 +395,12 @@ jobs:
395395
run: |
396396
tools/describe || git log --parents HEAD~4..
397397
echo >>$GITHUB_ENV CP_VERSION=$(tools/describe)
398-
- uses: actions/cache@v2
398+
- uses: actions/cache@v3
399399
name: Fetch IDF tool cache
400400
id: idf-cache
401401
with:
402402
path: ${{ github.workspace }}/.idf_tools
403-
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-20220404
403+
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-${{ steps.py3.outputs.python-path }}-20220404
404404
- name: Clone IDF submodules
405405
run: |
406406
(cd $IDF_PATH && git submodule update --init)
@@ -449,7 +449,7 @@ jobs:
449449
IDF_PATH: ${{ github.workspace }}/ports/espressif/esp-idf
450450
IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
451451
BOARDS: ${{ matrix.board }}
452-
- uses: actions/upload-artifact@v2
452+
- uses: actions/upload-artifact@v3
453453
with:
454454
name: ${{ matrix.board }}
455455
path: bin/${{ matrix.board }}
@@ -471,10 +471,10 @@ jobs:
471471
if: ${{ needs.test.outputs.boards-aarch != '[]' }}
472472
steps:
473473
- name: Set up Python 3
474-
uses: actions/setup-python@v2
474+
uses: actions/setup-python@v4
475475
with:
476476
python-version: "3.x"
477-
- uses: actions/checkout@v2.2.0
477+
- uses: actions/checkout@v3
478478
with:
479479
submodules: false
480480
fetch-depth: 1
@@ -486,8 +486,9 @@ jobs:
486486
pip install -r requirements-ci.txt -r requirements-dev.txt
487487
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
488488
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
489-
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
490-
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
489+
- uses: carlosperate/arm-none-eabi-gcc-action@v1
490+
with:
491+
release: '10-2020-q4'
491492
- name: Install mkfs.fat
492493
run: |
493494
wget https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz
@@ -513,7 +514,7 @@ jobs:
513514
working-directory: tools
514515
env:
515516
BOARDS: ${{ matrix.board }}
516-
- uses: actions/upload-artifact@v2
517+
- uses: actions/upload-artifact@v3
517518
with:
518519
name: ${{ matrix.board }}
519520
path: bin/${{ matrix.board }}

‎.github/workflows/create_website_pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
env:
1717
GITHUB_CONTEXT: ${{ toJson(github) }}
1818
run: echo "$GITHUB_CONTEXT"
19-
- uses: actions/checkout@v2.2.0
19+
- uses: actions/checkout@v3
2020
with:
2121
submodules: false
2222
fetch-depth: 1
2323
- name: Set up Python 3
24-
uses: actions/setup-python@v2
24+
uses: actions/setup-python@v4
2525
with:
2626
python-version: "3.x"
2727
- name: Get CP deps

‎.github/workflows/ports_windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
which python; python --version; python -c "import cascadetoml"
7272
which python3; python3 --version; python3 -c "import cascadetoml"
7373
74-
- uses: actions/checkout@v2.2.0
74+
- uses: actions/checkout@v3
7575
with:
7676
submodules: false
7777
fetch-depth: 1

‎.github/workflows/pre-commit.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,32 @@ concurrency:
1414

1515
jobs:
1616
pre-commit:
17-
runs-on: ubuntu-20.04
17+
runs-on: ubuntu-22.04
1818
steps:
19-
- uses: actions/checkout@v2.2.0
19+
- uses: actions/checkout@v3
2020
- name: Set up Python 3
21-
uses: actions/setup-python@v2
21+
uses: actions/setup-python@v4
2222
with:
2323
python-version: "3.x"
2424
- name: Install deps
2525
run: |
26-
sudo apt-add-repository -y -u ppa:pybricks/ppa
2726
sudo apt-get install -y gettext uncrustify
2827
pip3 install black polib pyyaml
2928
- name: Populate selected submodules
3029
run: git submodule update --init extmod/ulab
3130
- name: Set PY
3231
run: echo >>$GITHUB_ENV PY="$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')"
33-
- uses: actions/cache@v2
32+
- uses: actions/cache@v3
3433
with:
3534
path: ~/.cache/pre-commit
3635
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
37-
- uses: pre-commit/action@v1.1.0
36+
- uses: pre-commit/action@v3.0.0
3837
- name: Make patch
3938
if: failure()
4039
run: git diff > ~/pre-commit.patch
4140
- name: Upload patch
4241
if: failure()
43-
uses: actions/upload-artifact@v2
42+
uses: actions/upload-artifact@v3
4443
with:
4544
name: patch
4645
path: ~/pre-commit.patch

‎.gitmodules

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@
145145
url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
146146
[submodule "ports/espressif/esp-idf"]
147147
path = ports/espressif/esp-idf
148-
url = https://github.com/espressif/esp-idf.git
149-
branch = release/v4.4
148+
url = https://github.com/adafruit/esp-idf.git
149+
branch = circuitpython8
150150
[submodule "ports/espressif/certificates/nina-fw"]
151-
path = ports/espressif/certificates/nina-fw
151+
path = lib/certificates/nina-fw
152152
url = https://github.com/adafruit/nina-fw.git
153153
[submodule "frozen/Adafruit_CircuitPython_ST7789"]
154154
path = frozen/Adafruit_CircuitPython_ST7789
@@ -289,3 +289,33 @@
289289
[submodule "frozen/pew-pewpew-lcd"]
290290
path = frozen/pew-pewpew-lcd
291291
url = https://github.com/pypewpew/pew-pewpew-lcd.git
292+
[submodule "frozen/mixgo_cp_lib"]
293+
path = frozen/mixgo_cp_lib
294+
url = https://github.com/dahanzimin/circuitpython_lib.git
295+
[submodule "frozen/Adafruit_CircuitPython_IS31FL3731"]
296+
path = frozen/Adafruit_CircuitPython_IS31FL3731
297+
url = https://github.com/adafruit/Adafruit_CircuitPython_IS31FL3731.git
298+
[submodule "frozen/Adafruit_CircuitPython_Ticks"]
299+
path = frozen/Adafruit_CircuitPython_Ticks
300+
url = https://github.com/adafruit/Adafruit_CircuitPython_Ticks.git
301+
[submodule "frozen/Adafruit_CircuitPython_asyncio"]
302+
path = frozen/Adafruit_CircuitPython_asyncio
303+
url = https://github.com/adafruit/Adafruit_CircuitPython_asyncio.git
304+
[submodule "frozen/circuitpython_ef_music"]
305+
path = frozen/circuitpython_ef_music
306+
url = https://github.com/elecfreaks/circuitpython_ef_music.git
307+
[submodule "frozen/circuitpython_picoed"]
308+
path = frozen/circuitpython_picoed
309+
url = https://github.com/elecfreaks/circuitpython_picoed.git
310+
[submodule "ports/espressif/esp32-camera"]
311+
path = ports/espressif/esp32-camera
312+
url = https://github.com/adafruit/esp32-camera/
313+
[submodule "ports/raspberrypi/lib/cyw43-driver"]
314+
path = ports/raspberrypi/lib/cyw43-driver
315+
url = https://github.com/georgerobotics/cyw43-driver.git
316+
[submodule "ports/raspberrypi/lib/lwip"]
317+
path = ports/raspberrypi/lib/lwip
318+
url = https://github.com/lwip-tcpip/lwip.git
319+
[submodule "lib/mbedtls"]
320+
path = lib/mbedtls
321+
url = https://github.com/ARMmbed/mbedtls.git

‎.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repos:
1010
- id: end-of-file-fixer
1111
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/espressif/esp-idf-config/.*|ports/espressif/boards/.*/sdkconfig)'
1212
- id: trailing-whitespace
13-
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*)'
13+
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/.*)'
1414
- repo: local
1515
hooks:
1616
- id: translations

0 commit comments

Comments
 (0)