Skip to content

Commit c937d30

Browse files
lovrojakiclovrojakic
authored
Merge branch 'adafruit:main' into board-support-for-vidi-x
2 parents 07ceab1 + f603143 commit c937d30

File tree

790 files changed

+14545
-6416
lines changed

Some content is hidden

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

790 files changed

+14545
-6416
lines changed

‎.codespell/exclude-file.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ USB_PRODUCT = "BLOK"
55
print(binascii.b2a_base64(b"fo"))
66
# again, neither will "there" or "wither", since they have "the"
77
i1Qb$TE"rl
8+
ZEN = "the zen of python beautiful is better than ugly explicit is better than implicit simple is better than complex complex is better than complicated flat is better than nested sparse is better than dense readability counts special cases arent special enough to break the rules although practicality beats purity errors should never pass silently unless explicitly silenced in the face of ambiguity refuse the temptation to guess there should be one and preferably only one obvious way to do it although that way may not be obvious at first unless youre dutch now is better than never although never is often better than right now if the implementation is hard to explain its a bad idea if the implementation is easy to explain it may be a good idea namespaces are one honking great idea lets do more of those"
9+
"arent",
10+
"youre",

‎.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# all: Update Python formatting to ruff-format.
2+
bbd8760bd9a2302e5abee29db279102bb11d7732
3+
14
# all: Fix various spelling mistakes found by codespell 2.2.6.
25
cf490a70917a1b2d38ba9b58e763e0837d0f7ca7
36

‎.gitattributes

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@
1010
*.props text eol=crlf
1111
*.bat text eol=crlf
1212

13+
# CIRCUITPY-CHANGE: add some more binary types.
1314
# These are binary so should never be modified by git.
1415
*.a binary
16+
*.ico binary
1517
*.png binary
1618
*.jpg binary
1719
*.dxf binary
1820
*.mpy binary
21+
*.der binary
1922
*.deb binary
2023
*.zip binary
2124
*.pdf binary
@@ -24,11 +27,4 @@
2427
# These should also not be modified by git.
2528
tests/basics/string_cr_conversion.py -text
2629
tests/basics/string_crlf_conversion.py -text
27-
ports/stm32/pybcdc.inf_template -text
28-
ports/stm32/usbhost/** -text
29-
ports/cc3200/hal/aes.c -text
30-
ports/cc3200/hal/aes.h -text
31-
ports/cc3200/hal/des.c -text
32-
ports/cc3200/hal/i2s.c -text
33-
ports/cc3200/hal/i2s.h -text
34-
ports/cc3200/version.h -text
30+
# CIRCUITPY-CHANGE: remove non-CircuitPython tests

‎.github/actions/upload_aws/action.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ runs:
2020
steps:
2121
- name: Upload to S3
2222
if: >-
23-
(github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
24-
(github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
23+
(github.event_name == 'push' && github.repository_owner == 'adafruit') &&
24+
(github.ref == 'refs/heads/main' ||
25+
(startswith(github.ref, 'refs/heads/') && endswith(github.ref, '.x'))) ||
26+
(github.event_name == 'release' &&
27+
(github.event.action == 'published' || github.event.action == 'rerequested'))
2528
run: >-
2629
[ -z "$AWS_ACCESS_KEY_ID" ] ||
2730
aws s3 cp ${{ inputs.source }} s3://adafruit-circuit-python/bin/${{ inputs.destination }}

‎.github/workflows/build.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,13 @@ jobs:
255255
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
256256
unzip -q -d /tmp gcc-arm.zip
257257
tar -C /tmp/arm-gnu-toolchain* -cf - . | tar -C /usr/local -xf -
258-
pip install wheel
259-
# requirements_dev.txt doesn't install on windows. (with msys2 python)
258+
# We could use a venv instead, but that requires entering the venv on each run step
259+
# that runs in its own shell. There are some actions that help with that, but not for msys2
260+
# that I can find. (dhalbert)
261+
pip install --break-system-packages wheel
262+
# requirements-dev.txt doesn't install on windows. (with msys2 python)
260263
# instead, pick a subset for what we want to do
261-
pip install cascadetoml jinja2 typer click intelhex
264+
pip install --break-system-packages cascadetoml jinja2 typer click intelhex
262265
# check that installed packages work....?
263266
which python; python --version; python -c "import cascadetoml"
264267
which python3; python3 --version; python3 -c "import cascadetoml"

‎.github/workflows/run-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ on:
99

1010
jobs:
1111
run:
12-
runs-on: ubuntu-22.04
12+
runs-on: ubuntu-24.04
1313
strategy:
1414
fail-fast: false
1515
matrix:
1616
test: [all, mpy, native, native_mpy]
1717
env:
1818
CP_VERSION: ${{ inputs.cp-version }}
19-
MICROPY_CPYTHON3: python3.8
19+
MICROPY_CPYTHON3: python3.12
2020
MICROPY_MICROPYTHON: ../ports/unix/build-coverage/micropython
2121
TEST_all:
2222
TEST_mpy: --via-mpy -d basics float micropython
@@ -32,7 +32,7 @@ jobs:
3232
- name: Set up python
3333
uses: actions/setup-python@v5
3434
with:
35-
python-version: 3.8
35+
python-version: 3.12
3636
- name: Set up submodules
3737
uses: ./.github/actions/deps/submodules
3838
with:

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
#
33
# SPDX-License-Identifier: MIT
44

5+
# CIRCUITPY-CHANGES: many additions
6+
57
# Compiled Sources
68
###################
79
*.o

‎.gitmodules

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
[submodule "ports/espressif/esp-idf"]
144144
path = ports/espressif/esp-idf
145145
url = https://github.com/adafruit/esp-idf.git
146-
branch = circuitpython-v5.2.2
146+
branch = circuitpython-v5.3.1
147147
[submodule "ports/espressif/esp-protocols"]
148148
path = ports/espressif/esp-protocols
149149
url = https://github.com/espressif/esp-protocols.git
@@ -345,7 +345,6 @@
345345
[submodule "ports/raspberrypi/lib/Pico-PIO-USB"]
346346
path = ports/raspberrypi/lib/Pico-PIO-USB
347347
url = https://github.com/sekigon-gonnoc/Pico-PIO-USB.git
348-
branch = main
349348
[submodule "lib/micropython-lib"]
350349
path = lib/micropython-lib
351350
url = https://github.com/micropython/micropython-lib.git
@@ -354,8 +353,8 @@
354353
url = https://github.com/adafruit/certificates
355354
[submodule "lib/tlsf"]
356355
path = lib/tlsf
357-
url = https://github.com/adafruit/tlsf.git
358-
branch = circuitpython
356+
url = https://github.com/espressif/tlsf.git
357+
branch = idf
359358
[submodule "frozen/CircuitPython_AXP313A"]
360359
path = frozen/CircuitPython_AXP313A
361360
url = https://github.com/bill88t/CircuitPython_AXP313A
@@ -395,3 +394,15 @@
395394
[submodule "frozen/Adafruit_CircuitPython_LED_Animation"]
396395
path = frozen/Adafruit_CircuitPython_LED_Animation
397396
url = https://github.com/adafruit/Adafruit_CircuitPython_LED_Animation
397+
[submodule "frozen/CircuitPython_AXP2101"]
398+
path = frozen/CircuitPython_AXP2101
399+
url = https://github.com/CDarius/CircuitPython_AXP2101
400+
[submodule "frozen/CircuitPython_BMA423"]
401+
path = frozen/CircuitPython_BMA423
402+
url = https://github.com/jposada202020/CircuitPython_BMA423
403+
[submodule "frozen/Adafruit_CircuitPython_PCF8563"]
404+
path = frozen/Adafruit_CircuitPython_PCF8563
405+
url = https://github.com/adafruit/Adafruit_CircuitPython_PCF8563
406+
[submodule "frozen/Adafruit_CircuitPython_Wiznet5k"]
407+
path = frozen/Adafruit_CircuitPython_Wiznet5k
408+
url = https://github.com/adafruit/Adafruit_CircuitPython_Wiznet5k

‎.mailmap

Lines changed: 126 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,36 @@
11
# SPDX-FileCopyrightText: 2020 Diego Elio Pettenò
2+
# SPDX-FileCopyrightText: 2024, Rylie Pavlik
23
#
34
# SPDX-License-Identifier: Unlicense
45

6+
Alec Delaney <[email protected]>
7+
Alec Delaney <[email protected]> <[email protected]>
8+
Alec Delaney <[email protected]> <[email protected]>
9+
Alex Sirota <[email protected]>
10+
Alex Sirota <[email protected]> <[email protected]>
511
Alexander Steffen <[email protected]>
612
Alexander Steffen <[email protected]> <[email protected]>
713
Alexander Steffen <[email protected]> <[email protected]>
14+
Anson He <[email protected]>
15+
Ayke van Laethem <[email protected]>
816
Benjamin Vernoux <[email protected]>
17+
BennyE <[email protected]>
18+
BennyE <[email protected]> <[email protected]>
19+
Bernhard Bablok <[email protected]>
20+
Bernhard Boser <[email protected]>
21+
Bernhard Boser <[email protected]> <[email protected]>
22+
Bernhard Boser <[email protected]> <[email protected]>
23+
Bill Sideris <[email protected]>
24+
Brendan <[email protected]>
925
Brent Rubell <[email protected]>
1026
Brent Rubell <[email protected]> <[email protected]>
1127
Brent Rubell <[email protected]> <[email protected]>
1228
Carlos <[email protected]>
29+
Carter Nelson <[email protected]>
30+
Chris Dailey <[email protected]>
1331
Chris Packham <[email protected]>
1432
Chris Packham <[email protected]> <[email protected]>
33+
Chris Wilson <[email protected]>
1534
Damiano Mazzella <[email protected]>
1635
Damien George <[email protected]>
1736
Dan Halbert <[email protected]>
@@ -20,45 +39,92 @@ Daniel Pollard <[email protected]>
2039
Daniel Pollard <[email protected]> <[email protected]>
2140
Daniel Tralamazza <[email protected]>
2241
Daniel Tralamazza <[email protected]> <[email protected]>
42+
DavePutz <[email protected]>
2343
David Glaude <[email protected]>
2444
David Glaude <[email protected]> <[email protected]>
45+
Elvis Pfützenreuter <[email protected]>
46+
Enrique Casado <[email protected]>
47+
Enrique Casado <[email protected]> <[email protected]>
48+
Eva Herrada <[email protected]>
49+
Eva Herrada <[email protected]> <[email protected]>
50+
Eva Herrada <[email protected]> <[email protected]>
51+
Eva Herrada <[email protected]> <[email protected]>
52+
Eva Herrada <[email protected]> <[email protected]>
53+
Eva Herrada <[email protected]> dherrada <=>
54+
Florin Maticu <[email protected]>
55+
Florin Maticu <[email protected]> <[email protected]>
56+
Florin Maticu <[email protected]> <[email protected]>
57+
Frédéric Pierson <[email protected]>
58+
Fábio Souza <[email protected]>
2559
George Waters <[email protected]>
2660
George Waters <[email protected]> <[email protected]>
61+
Glenn Moloney <[email protected]>
2762
Ha Thach <[email protected]>
2863
Henrik Sölver <[email protected]>
64+
Ihor Nehrutsa <[email protected]>
65+
Ihor Nehrutsa <[email protected]> <[email protected]>
2966
Ilya Dmitrichenko <[email protected]>
3067
Ilya Dmitrichenko <[email protected]> <[email protected]>
68+
James Bowman <[email protected]>
69+
James Bowman <[email protected]> <James Bowman>
70+
James Carr <[email protected]>
71+
James Carr <[email protected]> <[email protected]>
72+
James Nadeau <[email protected]>
73+
Jan Hrudka <[email protected]>
3174
Jason Pecor <[email protected]>
3275
Jeff Epler <[email protected]>
3376
Jeff Epler <[email protected]> <[email protected]>
3477
Jeff Epler <[email protected]> <[email protected]>
3578
Jeff Epler <[email protected]> <[email protected]>
79+
Jensen Kuras <[email protected]>
80+
Jeremy Littler <[email protected]>
81+
Jeremy Littler <[email protected]> <[email protected]>
3682
Jerry Needell <[email protected]>
3783
Joe Bakalor <[email protected]>
84+
Jonah Yolles-Murphy <[email protected]>
85+
Jonah Yolles-Murphy <[email protected]> <[email protected]>
86+
Jonah Yolles-Murphy <[email protected]> <[email protected]>
87+
Jonah Yolles-Murphy <[email protected]> <[email protected]>
88+
Jonathan Giles <[email protected]>
89+
Jonathan Giles <[email protected]> <[email protected]>
90+
Jonny Bergdahl <[email protected]>
91+
Jonny Bergdahl <[email protected]> <[email protected]>
92+
Jos Verlinde <[email protected]>
93+
Jos Verlinde <[email protected]> <[email protected]>
94+
Jos Verlinde <[email protected]> <[email protected]>
3895
Josh Klar <[email protected]>
3996
Josh Klar <[email protected]> <[email protected]>
4097
Juan Biondi <[email protected]>
4198
Juan Biondi <[email protected]> <[email protected]>
99+
Julia Hathaway <[email protected]>
42100
KalbeAbbas <[email protected]>
43101
KalbeAbbas <[email protected]> <kalbeabbas@[email protected]>
44102
Kamil Tomaszewski <[email protected]>
45103
Kamil Tomaszewski <[email protected]> <[email protected]>
46-
Kattni <[email protected]> <[email protected]>
47-
Kattni Rembor <[email protected]>
104+
Kattni Rembor <[email protected]>
105+
Kattni Rembor <[email protected]> <[email protected]>
106+
Kattni Rembor <[email protected]> <[email protected]>
48107
Kenny <[email protected]>
49108
Kenny <[email protected]> <[email protected]>
109+
Kevin Matocha <[email protected]>
110+
Kevin Matocha <[email protected]> <[email protected]>
50111
Kevin Townsend <[email protected]>
51112
Kevin Townsend <[email protected]> <[email protected]>
52113
Krzysztof Blazewicz <[email protected]>
53114
Krzysztof Blazewicz <[email protected]> <[email protected]>
115+
Lee Atkinson <[email protected]>
54116
Li Weiwei <[email protected]>
55117
Li Weiwei <[email protected]> <[email protected]>
56118
Limor "Ladyada" Fried <[email protected]>
57119
Limor "Ladyada" Fried <[email protected]> <ladyada>
58120
Lucian Copeland <[email protected]>
59121
Lucian Copeland <[email protected]> <[email protected]>
122+
Mariusz Ćwikła <[email protected]>
123+
Mariusz Ćwikła <[email protected]> <[email protected]>
60124
Mark Olsson <[email protected]>
61125
Mark Olsson <[email protected]> <[email protected]>
126+
Mark Roberts <[email protected]>
127+
Martin Fischer <[email protected]>
62128
Matt Land <[email protected]>
63129
Matt Land <[email protected]> <[email protected]>
64130
Matt Wozniski <[email protected]>
@@ -67,17 +133,44 @@ Melissa LeBlanc-Williams <[email protected]>
67133
Melissa LeBlanc-Williams <[email protected]> <[email protected]>
68134
Metallicow <[email protected]>
69135
Metallicow <[email protected]> <[email protected]>
136+
Michael McWethy <[email protected]>
137+
Michael Weiss <[email protected]>
138+
MicroDev <[email protected]>
139+
MicroDev <[email protected]> <[email protected]>
140+
Mike Teachman <[email protected]>
141+
Milind Movasha <[email protected]>
142+
Miroslav Zuzelka <[email protected]>
143+
Noel Gaetan <[email protected]>
144+
Pablo Martinez Bernal <[email protected]>
145+
Pablo Martinez Bernal <[email protected]> <[email protected]>
146+
Paint Your Dragon <[email protected]>
147+
Patrick <[email protected]>
70148
Peter Hinch <[email protected]>
71149
Peter Hinch <[email protected]> <[email protected]>
150+
Pierre Constantineau <[email protected]>
151+
Pierre Constantineau <[email protected]> <[email protected]>
72152
Radomir Dopieralski <[email protected]>
73153
Radomir Dopieralski <[email protected]> <[email protected]>
74154
Rafa Gould <[email protected]>
75155
Rafa Gould <[email protected]> <[email protected]>
156+
Rami Ali <[email protected]>
157+
Rami Ali <[email protected]> Rami Ali <[email protected]>
158+
Reinhard Feger <[email protected]>
159+
Reinhard Feger <[email protected]> <[email protected]>
160+
Rick Sorensen <[email protected]>
161+
Rick Sorensen <[email protected]> <rick@ricklinux2>
162+
Robert HH <[email protected]>
163+
Rose Hooper <[email protected]>
76164
Ryan Shaw <[email protected]>
77165
Ryan Shaw <[email protected]> <[email protected]>
166+
Ryan T. Hamilton <[email protected]>
167+
Ryan T. Hamilton <[email protected]> <[email protected]>
168+
Rylie Pavlik <[email protected]>
169+
Rylie Pavlik <[email protected]> <[email protected]>
78170
Sabas <[email protected]>
79171
Sabas <[email protected]> <[email protected]>
80172
Sabas <[email protected]> <[email protected]>
173+
Scott Gauche <[email protected]> <[email protected]>
81174
Scott Shawcroft <[email protected]>
82175
Scott Shawcroft <[email protected]> <[email protected]>
83176
Scott Shawcroft <[email protected]> <[email protected]>
@@ -87,22 +180,48 @@ Sebastian Plamauer <[email protected]>
87180
Sebastian Plamauer <[email protected]> <[email protected]>
88181
Senuros <[email protected]>
89182
Senuros <[email protected]> <[email protected]>
183+
Seth Kerr <[email protected]>
184+
Seth Kerr <[email protected]> <[email protected]>
185+
Seth Kerr <[email protected]> <[email protected]>
186+
Shawn Hymel <[email protected]>
187+
Sky Bryant <[email protected]>
188+
Sky Bryant <[email protected]> <[email protected]>
189+
Stephane Smith <[email protected]>
90190
Stewart Colborne <[email protected]>
91191
Stewart Colborne <[email protected]> <[email protected]>
92-
TG-Techie <TGTechie01@gmail.com>
93-
TG-Techie <[email protected]> <[email protected].com>
192+
Sébastien Rinsoz <sebastien@yoctopuce.com>
193+
Takeo Takahashi <takeo.takahashi.xv@renesas.com>
94194
Thea Flowers <[email protected]>
95195
Thea Flowers <[email protected]> <[email protected]>
196+
Thorsten von Eicken <[email protected]>
197+
Thorsten von Eicken <[email protected]> <[email protected]>
198+
Tim <[email protected]>
199+
Tim <[email protected]> <[email protected]>
96200
Tobias Badertscher <[email protected]>
97201
Tobias Badertscher <[email protected]> <[email protected]>
202+
Tobias Schmale <[email protected]>
203+
Trammell Hudson <[email protected]>
204+
Tyeth Gundry <[email protected]>
205+
Unexpected Maker <[email protected]>
206+
Vladimír Smitka <[email protected]>
207+
Yuuki NAGAO <[email protected]>
208+
adam_cummick <[email protected]>
209+
applecuckoo <[email protected]>
210+
applecuckoo <[email protected]> <[email protected]>
211+
arturo182 <[email protected]> <[email protected]>
98212
danicampora <[email protected]>
99213
danicampora <[email protected]> <[email protected]>
100-
dherrada <[email protected]>
101-
dherrada <[email protected]> <[email protected]>
102-
dherrada <[email protected]> <=>
214+
foamyguy <[email protected]>
103215
glennrub <[email protected]>
216+
jposada202020 <[email protected]>
217+
jposada202020 <[email protected]> <[email protected]>
218+
mintakka <[email protected]>
219+
mintakka <[email protected]> <[email protected]>
220+
noqman <[email protected]>
221+
noqman <[email protected]> <[email protected]>
104222
retoc <[email protected]>
105223
retoc <[email protected]> <[email protected]>
224+
roland van straten <[email protected]>
106225
siddacious <[email protected]>
107226
siddacious <[email protected]> <[email protected]>
108227
siddacious <[email protected]> <[email protected]>

0 commit comments

Comments
 (0)