Skip to content

Commit e82f7be

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/main' into esp_parallelbus
2 parents 3b15931 + 7ba62bb commit e82f7be

174 files changed

Lines changed: 2311 additions & 351 deletions

File tree

Some content is hidden

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

‎.gitmodules‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,8 @@
306306
url = https://github.com/elecfreaks/circuitpython_picoed.git
307307
[submodule "ports/raspberrypi/lib/cyw43-driver"]
308308
path = ports/raspberrypi/lib/cyw43-driver
309-
url = https://github.com/georgerobotics/cyw43-driver.git
309+
url = https://github.com/adafruit/cyw43-driver
310+
branch = circuitpython9
310311
[submodule "ports/raspberrypi/lib/lwip"]
311312
path = ports/raspberrypi/lib/lwip
312313
url = https://github.com/adafruit/lwip.git

‎Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,8 @@ stubs:
271271
@cp setup.py-stubs circuitpython-stubs/setup.py
272272
@cp README.rst-stubs circuitpython-stubs/README.rst
273273
@cp MANIFEST.in-stubs circuitpython-stubs/MANIFEST.in
274+
@$(PYTHON) tools/board_stubs/build_board_specific_stubs/board_stub_builder.py
275+
@cp -r tools/board_stubs/circuitpython_setboard circuitpython-stubs/circuitpython_setboard
274276
@$(PYTHON) -m build circuitpython-stubs
275277

276278
.PHONY: check-stubs

‎docs/shared_bindings_matrix.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,11 @@ def get_settings_from_makefile(port_dir, board_name):
173173
174174
This list must explicitly include any setting queried by tools/ci_set_matrix.py.
175175
"""
176+
if os.getenv('NO_BINDINGS_MATRIX'):
177+
return {
178+
'CIRCUITPY_BUILD_EXTENSIONS': '.bin'
179+
}
180+
176181
contents = subprocess.run(
177182
["make", "-C", port_dir, "-f", "Makefile", f"BOARD={board_name}", "print-CFLAGS", "print-CIRCUITPY_BUILD_EXTENSIONS", "print-FROZEN_MPY_DIRS", "print-SRC_PATTERNS", "print-SRC_SUPERVISOR"],
178183
encoding="utf-8",

‎locale/ID.po‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,9 @@ msgid "%q must be multiple of 8."
210210
msgstr ""
211211

212212
#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
213-
#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
214-
#: shared-bindings/supervisor/__init__.c shared-module/synthio/Synthesizer.c
213+
#: shared-bindings/bitmapfilter/__init__.c shared-bindings/canio/CAN.c
214+
#: shared-bindings/digitalio/Pull.c shared-bindings/supervisor/__init__.c
215+
#: shared-module/synthio/Synthesizer.c
215216
msgid "%q must be of type %q or %q, not %q"
216217
msgstr ""
217218

@@ -739,6 +740,7 @@ msgstr "Tidak dapat mengatur CCCD pada Karakteristik lokal"
739740

740741
#: shared-bindings/storage/__init__.c shared-bindings/usb_cdc/__init__.c
741742
#: shared-bindings/usb_hid/__init__.c shared-bindings/usb_midi/__init__.c
743+
#: shared-bindings/uvc/__init__.c
742744
msgid "Cannot change USB devices now"
743745
msgstr ""
744746

‎locale/circuitpython.pot‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,9 @@ msgid "%q must be multiple of 8."
207207
msgstr ""
208208

209209
#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
210-
#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
211-
#: shared-bindings/supervisor/__init__.c shared-module/synthio/Synthesizer.c
210+
#: shared-bindings/bitmapfilter/__init__.c shared-bindings/canio/CAN.c
211+
#: shared-bindings/digitalio/Pull.c shared-bindings/supervisor/__init__.c
212+
#: shared-module/synthio/Synthesizer.c
212213
msgid "%q must be of type %q or %q, not %q"
213214
msgstr ""
214215

@@ -734,6 +735,7 @@ msgstr ""
734735

735736
#: shared-bindings/storage/__init__.c shared-bindings/usb_cdc/__init__.c
736737
#: shared-bindings/usb_hid/__init__.c shared-bindings/usb_midi/__init__.c
738+
#: shared-bindings/uvc/__init__.c
737739
msgid "Cannot change USB devices now"
738740
msgstr ""
739741

‎locale/cs.po‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,9 @@ msgid "%q must be multiple of 8."
218218
msgstr ""
219219

220220
#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
221-
#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
222-
#: shared-bindings/supervisor/__init__.c shared-module/synthio/Synthesizer.c
221+
#: shared-bindings/bitmapfilter/__init__.c shared-bindings/canio/CAN.c
222+
#: shared-bindings/digitalio/Pull.c shared-bindings/supervisor/__init__.c
223+
#: shared-module/synthio/Synthesizer.c
223224
msgid "%q must be of type %q or %q, not %q"
224225
msgstr "%q musí být typu %q nebo %q, ne %q"
225226

@@ -750,6 +751,7 @@ msgstr "Nelze nastavit CCCD na místní charakteristiku"
750751

751752
#: shared-bindings/storage/__init__.c shared-bindings/usb_cdc/__init__.c
752753
#: shared-bindings/usb_hid/__init__.c shared-bindings/usb_midi/__init__.c
754+
#: shared-bindings/uvc/__init__.c
753755
msgid "Cannot change USB devices now"
754756
msgstr "Nelze změnit USB zařízení"
755757

‎locale/de_DE.po‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,9 @@ msgid "%q must be multiple of 8."
217217
msgstr "%q muss ein Vielfaches von 8 sein."
218218

219219
#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
220-
#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
221-
#: shared-bindings/supervisor/__init__.c shared-module/synthio/Synthesizer.c
220+
#: shared-bindings/bitmapfilter/__init__.c shared-bindings/canio/CAN.c
221+
#: shared-bindings/digitalio/Pull.c shared-bindings/supervisor/__init__.c
222+
#: shared-module/synthio/Synthesizer.c
222223
msgid "%q must be of type %q or %q, not %q"
223224
msgstr "%q muss von Typ %q oder %q sein, nicht %q"
224225

@@ -749,6 +750,7 @@ msgstr "CCCD kann nicht auf lokales Merkmal eingestellt werden"
749750

750751
#: shared-bindings/storage/__init__.c shared-bindings/usb_cdc/__init__.c
751752
#: shared-bindings/usb_hid/__init__.c shared-bindings/usb_midi/__init__.c
753+
#: shared-bindings/uvc/__init__.c
752754
msgid "Cannot change USB devices now"
753755
msgstr "Kann USB-Geräte jetzt nicht ändern"
754756

‎locale/el.po‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,9 @@ msgid "%q must be multiple of 8."
222222
msgstr ""
223223

224224
#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
225-
#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
226-
#: shared-bindings/supervisor/__init__.c shared-module/synthio/Synthesizer.c
225+
#: shared-bindings/bitmapfilter/__init__.c shared-bindings/canio/CAN.c
226+
#: shared-bindings/digitalio/Pull.c shared-bindings/supervisor/__init__.c
227+
#: shared-module/synthio/Synthesizer.c
227228
msgid "%q must be of type %q or %q, not %q"
228229
msgstr "%q πρέπει να είναι τύπου %q ή %q, όχι %q"
229230

@@ -752,6 +753,7 @@ msgstr "Δεν μπορεί να οριστεί CCCD σε τοπικό Character
752753

753754
#: shared-bindings/storage/__init__.c shared-bindings/usb_cdc/__init__.c
754755
#: shared-bindings/usb_hid/__init__.c shared-bindings/usb_midi/__init__.c
756+
#: shared-bindings/uvc/__init__.c
755757
msgid "Cannot change USB devices now"
756758
msgstr "Δεν μπορούν να αλλάξουν οι USB συσκευές τώρα"
757759

‎locale/en_GB.po‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"PO-Revision-Date: 2024-01-28 16:01+0000\n"
10+
"PO-Revision-Date: 2024-02-07 02:01+0000\n"
1111
"Last-Translator: Andi Chandler <andi@gowling.com>\n"
1212
"Language-Team: none\n"
1313
"Language: en_GB\n"
@@ -220,8 +220,9 @@ msgid "%q must be multiple of 8."
220220
msgstr "%q must be multiple of 8."
221221

222222
#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
223-
#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
224-
#: shared-bindings/supervisor/__init__.c shared-module/synthio/Synthesizer.c
223+
#: shared-bindings/bitmapfilter/__init__.c shared-bindings/canio/CAN.c
224+
#: shared-bindings/digitalio/Pull.c shared-bindings/supervisor/__init__.c
225+
#: shared-module/synthio/Synthesizer.c
225226
msgid "%q must be of type %q or %q, not %q"
226227
msgstr "%q must be of type %q or %q, not %q"
227228

@@ -749,6 +750,7 @@ msgstr "Can't set CCCD on local Characteristic"
749750

750751
#: shared-bindings/storage/__init__.c shared-bindings/usb_cdc/__init__.c
751752
#: shared-bindings/usb_hid/__init__.c shared-bindings/usb_midi/__init__.c
753+
#: shared-bindings/uvc/__init__.c
752754
msgid "Cannot change USB devices now"
753755
msgstr "Cannot change USB devices now"
754756

‎locale/es.po‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,9 @@ msgid "%q must be multiple of 8."
222222
msgstr ""
223223

224224
#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
225-
#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
226-
#: shared-bindings/supervisor/__init__.c shared-module/synthio/Synthesizer.c
225+
#: shared-bindings/bitmapfilter/__init__.c shared-bindings/canio/CAN.c
226+
#: shared-bindings/digitalio/Pull.c shared-bindings/supervisor/__init__.c
227+
#: shared-module/synthio/Synthesizer.c
227228
msgid "%q must be of type %q or %q, not %q"
228229
msgstr "%q debe ser del tipo %q o %q, y no %q"
229230

@@ -756,6 +757,7 @@ msgstr "No se puede configurar CCCD en la característica local"
756757

757758
#: shared-bindings/storage/__init__.c shared-bindings/usb_cdc/__init__.c
758759
#: shared-bindings/usb_hid/__init__.c shared-bindings/usb_midi/__init__.c
760+
#: shared-bindings/uvc/__init__.c
759761
msgid "Cannot change USB devices now"
760762
msgstr "No se pueden cambiar dispositivos USB en este momento"
761763

0 commit comments

Comments
 (0)