Skip to content

Commit b580df5

Browse files
authored
Merge branch 'adafruit:main' into main
2 parents 4ae6afa + 87f7bc9 commit b580df5

File tree

263 files changed

+5517
-1182
lines changed

Some content is hidden

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

263 files changed

+5517
-1182
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
cp-version: ${{ needs.scheduler.outputs.cp-version }}
103103

104104
mpy-cross-mac:
105-
runs-on: macos-11
105+
runs-on: macos-12
106106
needs: scheduler
107107
if: needs.scheduler.outputs.ports != '{}'
108108
env:
@@ -129,29 +129,29 @@ jobs:
129129
run: make -C mpy-cross -j4
130130
- uses: actions/upload-artifact@v4
131131
with:
132-
name: mpy-cross-macos-11-x64
132+
name: mpy-cross-macos-x64
133133
path: mpy-cross/build/mpy-cross
134134
- name: Build mpy-cross (arm64)
135135
run: make -C mpy-cross -j4 -f Makefile.m1 V=2
136136
- uses: actions/upload-artifact@v4
137137
with:
138-
name: mpy-cross-macos-11-arm64
138+
name: mpy-cross-macos-arm64
139139
path: mpy-cross/build-arm64/mpy-cross-arm64
140140
- name: Make universal binary
141141
run: lipo -create -output mpy-cross-macos-universal mpy-cross/build/mpy-cross mpy-cross/build-arm64/mpy-cross-arm64
142142
- name: Upload artifact
143143
uses: actions/upload-artifact@v4
144144
with:
145-
name: mpy-cross-macos-11-universal
145+
name: mpy-cross-macos-universal
146146
path: mpy-cross-macos-universal
147147
- name: Upload to S3
148148
if: >-
149149
(github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
150150
(github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
151151
run: |
152-
[ -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
153-
[ -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
154-
[ -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
152+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/macos/mpy-cross-macos-${{ env.CP_VERSION }}-universal --no-progress --region us-east-1
153+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/build-arm64/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/macos/mpy-cross-macos-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
154+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/build/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/macos/mpy-cross-macos-${{ env.CP_VERSION }}-x64 --no-progress --region us-east-1
155155
env:
156156
AWS_PAGER: ''
157157
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

.gitmodules

Lines changed: 10 additions & 1 deletion
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.1.3
146+
branch = circuitpython-v5.2.2
147147
[submodule "ports/espressif/esp-protocols"]
148148
path = ports/espressif/esp-protocols
149149
url = https://github.com/espressif/esp-protocols.git
@@ -386,3 +386,12 @@
386386
[submodule "frozen/Adafruit_CircuitPython_Bitmap_Font"]
387387
path = frozen/Adafruit_CircuitPython_Bitmap_Font
388388
url = https://github.com/adafruit/Adafruit_CircuitPython_Bitmap_Font
389+
[submodule "frozen/Adafruit_CircuitPython_MPU6050"]
390+
path = frozen/Adafruit_CircuitPython_MPU6050
391+
url = https://github.com/adafruit/Adafruit_CircuitPython_MPU6050
392+
[submodule "frozen/Adafruit_CircuitPython_Pixel_Framebuf"]
393+
path = frozen/Adafruit_CircuitPython_Pixel_Framebuf
394+
url = https://github.com/adafruit/Adafruit_CircuitPython_Pixel_Framebuf
395+
[submodule "frozen/Adafruit_CircuitPython_LED_Animation"]
396+
path = frozen/Adafruit_CircuitPython_LED_Animation
397+
url = https://github.com/adafruit/Adafruit_CircuitPython_LED_Animation

.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+
8+
9+
Alex Sirota <[email protected]>
10+
511
Alexander Steffen <[email protected]>
612
713
14+
15+
Ayke van Laethem <[email protected]>
816
Benjamin Vernoux <[email protected]>
17+
18+
19+
Bernhard Bablok <[email protected]>
20+
Bernhard Boser <[email protected]>
21+
22+
23+
Bill Sideris <[email protected]>
24+
925
Brent Rubell <[email protected]>
1026
1127
1228
29+
Carter Nelson <[email protected]>
30+
Chris Dailey <[email protected]>
1331
Chris Packham <[email protected]>
1432
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
2140
Daniel Tralamazza <[email protected]>
2241
42+
2343
David Glaude <[email protected]>
2444
45+
Elvis Pfützenreuter <[email protected]>
46+
Enrique Casado <[email protected]>
47+
48+
Eva Herrada <[email protected]>
49+
50+
51+
52+
53+
Eva Herrada <[email protected]> dherrada <=>
54+
Florin Maticu <[email protected]>
55+
56+
57+
Frédéric Pierson <[email protected]>
58+
Fábio Souza <[email protected]>
2559
George Waters <[email protected]>
2660
61+
Glenn Moloney <[email protected]>
2762
2863
Henrik Sölver <[email protected]>
64+
Ihor Nehrutsa <[email protected]>
65+
2966
Ilya Dmitrichenko <[email protected]>
3067
68+
James Bowman <[email protected]>
69+
James Bowman <[email protected]> <James Bowman>
70+
James Carr <[email protected]>
71+
72+
James Nadeau <[email protected]>
73+
Jan Hrudka <[email protected]>
3174
Jason Pecor <[email protected]>
3275
Jeff Epler <[email protected]>
3376
3477
3578
79+
Jensen Kuras <[email protected]>
80+
Jeremy Littler <[email protected]>
81+
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+
90+
Jonny Bergdahl <[email protected]>
91+
92+
Jos Verlinde <[email protected]>
93+
94+
3895
Josh Klar <[email protected]>
3996
4097
Juan Biondi <[email protected]>
4198
99+
Julia Hathaway <[email protected]>
42100
KalbeAbbas <[email protected]>
43101
KalbeAbbas <[email protected]> <kalbeabbas@[email protected]>
44102
Kamil Tomaszewski <[email protected]>
45103
46-
47-
Kattni Rembor <[email protected]>
104+
Kattni Rembor <[email protected]>
105+
106+
48107
49108
109+
Kevin Matocha <[email protected]>
110+
50111
Kevin Townsend <[email protected]>
51112
52113
Krzysztof Blazewicz <[email protected]>
53114
Krzysztof Blazewicz <[email protected]> <[email protected]>
115+
Lee Atkinson <[email protected]>
54116
Li Weiwei <[email protected]>
55117
56118
Limor "Ladyada" Fried <[email protected]>
57119
Limor "Ladyada" Fried <[email protected]> <ladyada>
58120
Lucian Copeland <[email protected]>
59121
122+
Mariusz Ćwikła <[email protected]>
123+
60124
Mark Olsson <[email protected]>
61125
126+
Mark Roberts <[email protected]>
127+
Martin Fischer <[email protected]>
62128
Matt Land <[email protected]>
63129
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
136+
Michael McWethy <[email protected]>
137+
Michael Weiss <[email protected]>
138+
139+
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+
70148
Peter Hinch <[email protected]>
71149
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
156+
157+
158+
Reinhard Feger <[email protected]>
159+
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
166+
Ryan T. Hamilton <[email protected]>
167+
168+
Rylie Pavlik <[email protected]>
169+
78170
79171
80172
173+
81174
Scott Shawcroft <[email protected]>
82175
83176
@@ -87,22 +180,48 @@ Sebastian Plamauer <[email protected]>
87180
Sebastian Plamauer <[email protected]> <[email protected]>
88181
89182
183+
Seth Kerr <[email protected]>
184+
185+
186+
Shawn Hymel <[email protected]>
187+
Sky Bryant <[email protected]>
188+
189+
Stephane Smith <[email protected]>
90190
Stewart Colborne <[email protected]>
91191
92-
TG-Techie <TGTechie01@gmail.com>
93-
192+
Sébastien Rinsoz <sebastien@yoctopuce.com>
193+
Takeo Takahashi <takeo.takahashi.xv@renesas.com>
94194
Thea Flowers <[email protected]>
95195
196+
Thorsten von Eicken <[email protected]>
197+
Thorsten von Eicken <[email protected]> <[email protected]>
198+
199+
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+
211+
98212
danicampora <[email protected]>
99213
100-
101-
102-
dherrada <[email protected]> <=>
214+
103215
216+
jposada202020 <[email protected]>
217+
218+
219+
220+
221+
104222
105223
224+
roland van straten <[email protected]>
106225
siddacious <[email protected]>
107226
108227

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,8 @@ stubs:
274274
@$(PYTHON) tools/board_stubs/build_board_specific_stubs/board_stub_builder.py
275275
@cp -r tools/board_stubs/circuitpython_setboard circuitpython-stubs/circuitpython_setboard
276276
@$(PYTHON) -m build circuitpython-stubs
277+
@touch circuitpython-stubs/board/__init__.py
278+
@touch circuitpython-stubs/board_definitions/__init__.py
277279

278280
.PHONY: check-stubs
279281
check-stubs: stubs

README.rst

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -223,24 +223,10 @@ Ports
223223

224224
Ports include the code unique to a microcontroller line.
225225

226-
================ ============================================================
227-
Supported Support status
228-
================ ============================================================
229-
atmel-samd ``SAMD21`` stable | ``SAMD51`` stable
230-
cxd56 stable
231-
espressif ``ESP32`` beta | ``ESP32-C3`` beta | ``ESP32-S2`` stable | ``ESP32-S3`` beta
232-
litex alpha
233-
mimxrt10xx alpha
234-
nordic stable
235-
raspberrypi stable
236-
silabs (efr32) alpha
237-
stm ``F4`` stable | ``others`` beta
238-
unix alpha
239-
================ ============================================================
240-
241-
- ``stable`` Highly unlikely to have bugs or missing functionality.
242-
- ``beta`` Being actively improved but may be missing functionality and have bugs.
243-
- ``alpha`` Will have bugs and missing functionality.
226+
The following ports are available: ``atmel-samd``, ``cxd56``, ``espressif``, ``litex``, ``mimxrt10xx``, ``nordic``, ``raspberrypi``, ``renode``, ``silabs`` (``efr32``), ``stm``, ``unix``.
227+
228+
However, not all ports are fully functional. Some have limited limited functionality and known serious bugs.
229+
For details, refer to the **Port status** section in the `latest release <https://github.com/adafruit/circuitpython/releases/latest>`__ notes.
244230

245231
Boards
246232
~~~~~~

conf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
autoapi_python_class_content = "both"
111111
autoapi_python_use_implicit_namespaces = True
112112
autoapi_root = "shared-bindings"
113+
autoapi_file_patterns = ["*.pyi"]
113114

114115
# Suppress cache warnings to prevent "unpickable" [sic] warning
115116
# about autoapi_prepare_jinja_env() from sphinx >= 7.3.0.
@@ -180,6 +181,7 @@ def autoapi_prepare_jinja_env(jinja_env):
180181
".venv",
181182
".direnv",
182183
".devcontainer/Readme.md",
184+
"circuitpython-stubs",
183185
"data",
184186
"docs/autoapi",
185187
"docs/README.md",

devices/ble_hci/common-hal/_bleio/__init__.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ bool vm_used_ble;
3737
// }
3838
// }
3939

40+
void common_hal_bleio_init(void) {
41+
}
42+
4043
void bleio_user_reset() {
4144
// HCI doesn't support the BLE workflow so just do a full reset.
4245
bleio_reset();

0 commit comments

Comments
 (0)