Skip to content

Commit f1c0682

Browse files
kreierkreier
authored
Merge pull request #2 from adafruit/main
Update changes of the last month for new hardware models
2 parents cc0eeb4 + 6627bd7 commit f1c0682

File tree

3,289 files changed

+153696
-71014
lines changed

Some content is hidden

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

3,289 files changed

+153696
-71014
lines changed

‎.codespell/ignore-words.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,9 @@ deques
2020
extint
2121
shs
2222
pass-thru
23+
numer
24+
arithmetics
25+
ftbfs
26+
straightaway
27+
ftbs
28+
ftb

‎.devcontainer/cortex-m/on-create.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ rm -fr /workspaces/dosfstools-4.2 /workspaces/dosfstools-4.2.tar.gz
3434
# prepare source-code tree
3535
cd /workspaces/circuitpython/
3636
echo -e "[on-create.sh] fetching submodules"
37-
make fetch-submodules
37+
make fetch-all-submodules
3838
echo -e "[on-create.sh] fetching tags"
3939
git fetch --tags --recurse-submodules=no --shallow-since="2021-07-01" https://github.com/adafruit/circuitpython HEAD
4040

‎.git-blame-ignore-revs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
# all: Fix various spelling mistakes found by codespell 2.2.6.
2+
cf490a70917a1b2d38ba9b58e763e0837d0f7ca7
3+
4+
# all: Fix spelling mistakes based on codespell check.
5+
b1229efbd1509654dec6053865ab828d769e29db
6+
7+
# top: Update Python formatting to black "2023 stable style".
8+
8b2748269244304854b3462cb8902952b4dcb892
9+
10+
# all: Reformat remaining C code that doesn't have a space after a comma.
11+
5b700b0af90591d6b1a2c087bb8de6b7f1bfdd2d
12+
13+
# ports: Reformat more C and Python source code.
14+
5c32111fa0e31e451b0f1666bdf926be2fdfd82c
15+
16+
# all: Update Python formatting to latest Black version 22.1.0.
17+
ab2923dfa1174dc177f0a90cb00a7e4ff87958d2
18+
19+
# all: Update Python formatting to latest Black version 21.12b0.
20+
3770fab33449a5dadf8eb06edfae0767e75320a6
21+
122
# tools/gen-cpydiff.py: Fix formatting of doc strings for new Black.
223
0f78c36c5aa458a954eed39a46942209107a553e
324

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,20 @@ runs:
2525
inputs.port != 'espressif'
2626
uses: carlosperate/arm-none-eabi-gcc-action@v1
2727
with:
28-
release: '10-2020-q4'
28+
# When changing this update what Windows grabs too!
29+
release: '13.2.Rel1'
2930

3031
# espressif
3132
- name: Get espressif toolchain
3233
if: inputs.port == 'espressif'
33-
run: sudo apt-get install -y ninja-build
34+
run: |
35+
sudo apt-get update
36+
sudo apt-get install -y ninja-build
3437
shell: bash
3538
- name: Install IDF tools
3639
if: inputs.port == 'espressif'
3740
run: |
38-
echo "Installing ESP-IDF tools"
39-
$IDF_PATH/tools/idf_tools.py --non-interactive install required
40-
$IDF_PATH/tools/idf_tools.py --non-interactive install cmake
41-
echo "Installing Python environment and packages"
42-
$IDF_PATH/tools/idf_tools.py --non-interactive install-python-env
41+
$IDF_PATH/install.sh
4342
rm -rf $IDF_TOOLS_PATH/dist
4443
shell: bash
4544
- name: Set environment

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ runs:
77
run: |
88
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
99
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
10+
sudo apt-get update
1011
sudo apt-get install -y mtools
1112
shell: bash
1213
- name: Install mkfs.fat

‎.github/actions/mpy_cross/action.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ inputs:
55
required: false
66
default: true
77
type: boolean
8+
cp-version:
9+
required: true
10+
type: string
811

912
runs:
1013
using: composite
@@ -16,22 +19,24 @@ runs:
1619
uses: actions/download-artifact@v3
1720
with:
1821
name: mpy-cross
19-
path: mpy-cross
22+
path: mpy-cross/build
2023

2124
- name: Make mpy-cross executable
2225
if: inputs.download == 'true' && steps.download-mpy-cross.outcome == 'success'
23-
run: sudo chmod +x mpy-cross/mpy-cross
26+
run: sudo chmod +x mpy-cross/build/mpy-cross
2427
shell: bash
2528

2629
- name: Build mpy-cross
2730
if: inputs.download == 'false' || steps.download-mpy-cross.outcome == 'failure'
2831
run: make -C mpy-cross -j2
2932
shell: bash
33+
env:
34+
CP_VERSION: ${{ inputs.cp-version }}
3035

3136
- name: Upload mpy-cross
3237
if: inputs.download == 'false' || steps.download-mpy-cross.outcome == 'failure'
3338
continue-on-error: true
3439
uses: actions/upload-artifact@v3
3540
with:
3641
name: mpy-cross
37-
path: mpy-cross/mpy-cross
42+
path: mpy-cross/build/mpy-cross

‎.github/workflows/build-boards.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ jobs:
4949
- name: Set up mpy-cross
5050
if: steps.set-up-submodules.outputs.frozen == 'True'
5151
uses: ./.github/actions/mpy_cross
52+
with:
53+
cp-version: ${{ inputs.cp-version }}
5254

5355
- name: Versions
5456
run: |
@@ -70,6 +72,7 @@ jobs:
7072
working-directory: tools
7173
env:
7274
BOARDS: ${{ matrix.board }}
75+
PULL: ${{ github.event.number }}
7376

7477
- name: Upload artifact
7578
uses: actions/upload-artifact@v3

‎.github/workflows/build-mpy-cross.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,14 @@ jobs:
4343

4444
- name: Install toolchain (aarch64)
4545
if: matrix.mpy-cross == 'static-aarch64'
46-
run: sudo apt-get install -y gcc-aarch64-linux-gnu
46+
run: |
47+
sudo apt-get update
48+
sudo apt-get install -y gcc-aarch64-linux-gnu
4749
- name: Install toolchain (mingw)
4850
if: matrix.mpy-cross == 'static-mingw'
49-
run: sudo apt-get install -y mingw-w64
51+
run: |
52+
sudo apt-get update
53+
sudo apt-get install -y mingw-w64
5054
5155
- name: Build mpy-cross.${{ matrix.mpy-cross }}
5256
run: make -C mpy-cross -j2 -f Makefile.${{ matrix.mpy-cross }}
@@ -60,11 +64,11 @@ jobs:
6064
uses: actions/upload-artifact@v3
6165
with:
6266
name: mpy-cross.${{ env.EX }}
63-
path: mpy-cross/mpy-cross.${{ env.EX }}
67+
path: mpy-cross/build-${{ matrix.mpy-cross }}/mpy-cross.${{ env.EX }}
6468
- name: Upload to S3
6569
uses: ./.github/actions/upload_aws
6670
with:
67-
source: mpy-cross/mpy-cross.${{ env.EX }}
71+
source: mpy-cross/build-${{ matrix.mpy-cross }}/mpy-cross.${{ env.EX }}
6872
destination: mpy-cross/${{ env.OS }}/mpy-cross-${{ env.OS }}-${{ env.CP_VERSION }}.${{ env.EX }}
6973
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
7074
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

‎.github/workflows/build.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
- name: Set up mpy-cross
5252
uses: ./.github/actions/mpy_cross
5353
with:
54+
cp-version: ${{ steps.set-up-submodules.outputs.version }}
5455
download: false
5556
- name: Get last commit with checks
5657
id: get-last-commit-with-checks
@@ -127,15 +128,15 @@ jobs:
127128
- uses: actions/upload-artifact@v3
128129
with:
129130
name: mpy-cross-macos-11-x64
130-
path: mpy-cross/mpy-cross
131+
path: mpy-cross/build/mpy-cross
131132
- name: Build mpy-cross (arm64)
132133
run: make -C mpy-cross -j2 -f Makefile.m1 V=2
133134
- uses: actions/upload-artifact@v3
134135
with:
135136
name: mpy-cross-macos-11-arm64
136-
path: mpy-cross/mpy-cross-arm64
137+
path: mpy-cross/build-arm64/mpy-cross-arm64
137138
- name: Make universal binary
138-
run: lipo -create -output mpy-cross-macos-universal mpy-cross/mpy-cross mpy-cross/mpy-cross-arm64
139+
run: lipo -create -output mpy-cross-macos-universal mpy-cross/build/mpy-cross mpy-cross/build-arm64/mpy-cross-arm64
139140
- name: Upload artifact
140141
uses: actions/upload-artifact@v3
141142
with:
@@ -147,8 +148,8 @@ jobs:
147148
(github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
148149
run: |
149150
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/macos-11/mpy-cross-macos-11-${{ env.CP_VERSION }}-universal --no-progress --region us-east-1
150-
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/macos-11/mpy-cross-macos-11-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
151-
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/macos-11/mpy-cross-macos-11-${{ env.CP_VERSION }}-x64 --no-progress --region us-east-1
151+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/build-arm64/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/macos-11/mpy-cross-macos-11-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
152+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/build/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/macos-11/mpy-cross-macos-11-${{ env.CP_VERSION }}-x64 --no-progress --region us-east-1
152153
env:
153154
AWS_PAGER: ''
154155
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -174,6 +175,7 @@ jobs:
174175
uses: ./.github/actions/deps/submodules
175176
- name: Install dependencies
176177
run: |
178+
sudo apt-get update
177179
sudo apt-get install -y latexmk librsvg2-bin texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra
178180
pip install -r requirements-doc.txt
179181
- name: Build and Validate Stubs
@@ -208,7 +210,7 @@ jobs:
208210
TWINE_USERNAME: ${{ secrets.pypi_username }}
209211
TWINE_PASSWORD: ${{ secrets.pypi_password }}
210212
run: |
211-
# setup.py sdist was run by 'make stubs'
213+
# python -m build was run by 'make stubs'
212214
[ -z "$TWINE_USERNAME" ] || echo "Uploading dev release to PyPi"
213215
[ -z "$TWINE_USERNAME" ] || twine upload circuitpython-stubs/dist/*
214216
@@ -247,9 +249,9 @@ jobs:
247249
python3 -c "import sys, locale; print(sys.getdefaultencoding(), locale.getpreferredencoding(False))"
248250
- name: Install dependencies
249251
run: |
250-
wget --no-verbose -O gcc-arm.zip https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-win32.zip
252+
wget --no-verbose -O gcc-arm.zip https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-mingw-w64-i686-arm-none-eabi.zip
251253
unzip -q -d /tmp gcc-arm.zip
252-
tar -C /tmp/gcc-arm-none-* -cf - . | tar -C /usr/local -xf -
254+
tar -C /tmp/arm-gnu-toolchain* -cf - . | tar -C /usr/local -xf -
253255
pip install wheel
254256
# requirements_dev.txt doesn't install on windows. (with msys2 python)
255257
# instead, pick a subset for what we want to do

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ jobs:
6565
if: steps.set-up-submodules.outputs.frozen == 'True'
6666
uses: ./.github/actions/mpy_cross
6767
with:
68+
cp-version: ${{ steps.set-up-submodules.outputs.version }}
6869
download: false
6970
- name: Versions
7071
run: |

‎.github/workflows/pre-commit.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ jobs:
3030
- name: Set up external
3131
uses: ./.github/actions/deps/external
3232
- name: Install dependencies
33-
run: sudo apt-get install -y gettext uncrustify
33+
run: |
34+
sudo apt-get update
35+
sudo apt-get install -y gettext uncrustify
3436
- name: Run pre-commit
3537
uses: pre-commit/[email protected]
3638
- name: Make patch

‎.github/workflows/run-tests.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
env:
1818
CP_VERSION: ${{ inputs.cp-version }}
1919
MICROPY_CPYTHON3: python3.8
20-
MICROPY_MICROPYTHON: ../ports/unix/micropython-coverage
20+
MICROPY_MICROPYTHON: ../ports/unix/build-coverage/micropython
2121
TEST_all:
2222
TEST_mpy: --via-mpy -d basics float micropython
2323
TEST_native: --emit native
@@ -41,6 +41,8 @@ jobs:
4141
uses: ./.github/actions/deps/external
4242
- name: Set up mpy-cross
4343
uses: ./.github/actions/mpy_cross
44+
with:
45+
cp-version: ${{ inputs.cp-version }}
4446
- name: Build unix port
4547
run: make -C ports/unix VARIANT=coverage -j2
4648
- name: Run tests
@@ -55,13 +57,10 @@ jobs:
5557
run: |
5658
make -C examples/natmod/features1
5759
make -C examples/natmod/features2
58-
make -C examples/natmod/btree
59-
make -C examples/natmod/framebuf
60-
make -C examples/natmod/uheapq
61-
make -C examples/natmod/urandom
62-
make -C examples/natmod/ure
63-
make -C examples/natmod/uzlib
60+
make -C examples/natmod/heapq
61+
make -C examples/natmod/random
62+
make -C examples/natmod/re
6463
- name: Test native modules
6564
if: matrix.test == 'all'
66-
run: ./run-natmodtests.py extmod/{btree*,framebuf*,uheapq*,ure*,uzlib*}.py
65+
run: ./run-natmodtests.py extmod/{heapq*,re*,zlib*}.py
6766
working-directory: tests

‎.gitmodules

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,14 @@
143143
[submodule "ports/espressif/esp-idf"]
144144
path = ports/espressif/esp-idf
145145
url = https://github.com/adafruit/esp-idf.git
146-
branch = release/v4.4-circuitpython
147-
[submodule "ports/espressif/certificates/nina-fw"]
148-
path = lib/certificates/nina-fw
149-
url = https://github.com/adafruit/nina-fw.git
146+
branch = circuitpython-v5.1.2
147+
[submodule "ports/espressif/esp-protocols"]
148+
path = ports/espressif/esp-protocols
149+
url = https://github.com/espressif/esp-protocols.git
150+
[submodule "ports/espressif/esp-camera"]
151+
path = ports/espressif/esp-camera
152+
url = https://github.com/adafruit/esp32-camera.git
153+
branch = circuitpython
150154
[submodule "frozen/Adafruit_CircuitPython_ST7789"]
151155
path = frozen/Adafruit_CircuitPython_ST7789
152156
url = https://github.com/adafruit/Adafruit_CircuitPython_ST7789
@@ -300,10 +304,6 @@
300304
[submodule "frozen/circuitpython_picoed"]
301305
path = frozen/circuitpython_picoed
302306
url = https://github.com/elecfreaks/circuitpython_picoed.git
303-
[submodule "ports/espressif/esp32-camera"]
304-
path = ports/espressif/esp32-camera
305-
url = https://github.com/adafruit/esp32-camera/
306-
branch = circuitpython
307307
[submodule "ports/raspberrypi/lib/cyw43-driver"]
308308
path = ports/raspberrypi/lib/cyw43-driver
309309
url = https://github.com/georgerobotics/cyw43-driver.git
@@ -324,3 +324,36 @@
324324
path = ports/broadcom/peripherals
325325
url = https://github.com/adafruit/broadcom-peripherals.git
326326
branch = main-build
327+
[submodule "ports/silabs/gecko_sdk"]
328+
path = ports/silabs/gecko_sdk
329+
url = https://github.com/SiliconLabs/gecko_sdk.git
330+
branch = v4.2.1
331+
[submodule "ports/silabs/tools/slc_cli_linux"]
332+
path = ports/silabs/tools/slc_cli_linux
333+
url = https://github.com/SiliconLabs/circuitpython_slc_cli_linux
334+
[submodule "ports/raspberrypi/lib/PicoDVI"]
335+
path = ports/raspberrypi/lib/PicoDVI
336+
url = https://github.com/circuitpython/PicoDVI.git
337+
branch = circuitpython
338+
[submodule "frozen/circuitpython-pcf85063a"]
339+
path = frozen/circuitpython-pcf85063a
340+
url = https://github.com/bablokb/circuitpython-pcf85063a
341+
[submodule "frozen/Adafruit_CircuitPython_Wave"]
342+
path = frozen/Adafruit_CircuitPython_Wave
343+
url = https://github.com/adafruit/Adafruit_CircuitPython_Wave.git
344+
[submodule "ports/raspberrypi/lib/Pico-PIO-USB"]
345+
path = ports/raspberrypi/lib/Pico-PIO-USB
346+
url = https://github.com/sekigon-gonnoc/Pico-PIO-USB.git
347+
branch = main
348+
[submodule "lib/micropython-lib"]
349+
path = lib/micropython-lib
350+
url = https://github.com/micropython/micropython-lib.git
351+
[submodule "lib/certificates"]
352+
path = lib/certificates
353+
url = https://github.com/adafruit/certificates
354+
[submodule "lib/tlsf"]
355+
path = lib/tlsf
356+
url = https://github.com/espressif/tlsf.git
357+
[submodule "frozen/CircuitPython_AXP313A"]
358+
path = frozen/CircuitPython_AXP313A
359+
url = https://github.com/bill88t/CircuitPython_AXP313A

‎.pre-commit-config.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ repos:
1919
exclude: |
2020
(?x)^(
2121
locale/|
22-
lib/
22+
lib/|
23+
tests/unicode/data/utf-8_invalid.txt|
24+
tests/extmod/data/qr.pgm|
25+
tests/basics/bytearray_byte_operations.py
2326
)
2427
- repo: local
2528
hooks:

0 commit comments

Comments
 (0)