Skip to content

Commit 8c1095b

Browse files
committed
Merge branch 'main' into add-codespell
2 parents bce1e7e + 2492fb0 commit 8c1095b

File tree

144 files changed

+2335
-1197
lines changed

Some content is hidden

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

144 files changed

+2335
-1197
lines changed

.gitmodules

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
path = ports/atmel-samd/asf4
3434
url = https://github.com/adafruit/asf4.git
3535
branch = circuitpython
36-
[submodule "tools/usb_descriptor"]
37-
path = tools/usb_descriptor
38-
url = https://github.com/adafruit/usb_descriptor.git
3936
[submodule "lib/nrfutil"]
4037
path = lib/nrfutil
4138
url = https://github.com/adafruit/nRF52_nrfutil
@@ -103,7 +100,7 @@
103100
url = https://github.com/adafruit/Adafruit_MP3
104101
[submodule "ports/mimxrt10xx/sdk"]
105102
path = ports/mimxrt10xx/sdk
106-
url = https://github.com/adafruit/MIMXRT10xx_SDK
103+
url = https://github.com/nxp-mcuxpresso/mcux-sdk.git
107104
[submodule "frozen/Adafruit_CircuitPython_Register"]
108105
path = frozen/Adafruit_CircuitPython_Register
109106
url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ repos:
1515
rev: v2.2.4
1616
hooks:
1717
- id: codespell
18-
#args: [-w]
18+
args: [-w]
1919
exclude: |
2020
(?x)^(
2121
locale/|

Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -324,10 +324,9 @@ clean-stm:
324324
$(MAKE) -C ports/stm BOARD=feather_stm32f405_express clean
325325

326326

327-
# This update will fail because the commits we need aren't the latest on the
328-
# branch. We can ignore that though because we fix it with the second command.
329-
# (Only works for git servers that allow sha fetches.)
327+
# Do blobless partial clones of submodules to save time and space.
328+
# A blobless partial clone lazily fetches data as needed, but has all the metadata available (tags, etc.)
329+
# so it does not have the idiosyncrasies of a shallow clone.
330330
.PHONY: fetch-submodules
331331
fetch-submodules:
332-
git submodule update --init -N --depth 1 || true
333-
git submodule foreach 'git fetch --tags --depth 1 origin $$sha1 && git checkout -q $$sha1'
332+
git submodule update --init --filter=blob:none

docs/design_guide.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -742,14 +742,7 @@ You could other examples if needed featuring different
742742
functionalities of the library.
743743
If you add additional examples, be sure to include them in the ``examples.rst``. Naming of the examples
744744
files should use the name of the library followed by a description, using underscore to separate them.
745-
When using print statements you should use the ``" ".format()`` format, as there are particular boards
746-
that are not capable to use f-strings.
747745

748-
.. code-block:: python
749-
750-
text_to_display = "World!"
751-
752-
print("Hello {}".format(text_to_display))
753746

754747
Sensor properties and units
755748
--------------------------------------------------------------------------------

lib/tinyusb

Submodule tinyusb updated 758 files

locale/ID.po

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,6 @@ msgid ""
3030
"Code stopped by auto-reload. Reloading soon.\n"
3131
msgstr ""
3232

33-
#: main.c
34-
msgid ""
35-
"\n"
36-
"Invalid CIRCUITPY_PYSTACK_SIZE\n"
37-
"\n"
38-
"\r"
39-
msgstr ""
40-
4133
#: supervisor/shared/safe_mode.c
4234
msgid ""
4335
"\n"
@@ -1264,6 +1256,10 @@ msgstr ""
12641256
msgid "Invalid BSSID"
12651257
msgstr ""
12661258

1259+
#: main.c
1260+
msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
1261+
msgstr ""
1262+
12671263
#: shared-bindings/wifi/Radio.c
12681264
msgid "Invalid MAC address"
12691265
msgstr ""

locale/circuitpython.pot

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,6 @@ msgid ""
2828
"Code stopped by auto-reload. Reloading soon.\n"
2929
msgstr ""
3030

31-
#: main.c
32-
msgid ""
33-
"\n"
34-
"Invalid CIRCUITPY_PYSTACK_SIZE\n"
35-
"\n"
36-
"\r"
37-
msgstr ""
38-
3931
#: supervisor/shared/safe_mode.c
4032
msgid ""
4133
"\n"
@@ -1253,6 +1245,10 @@ msgstr ""
12531245
msgid "Invalid BSSID"
12541246
msgstr ""
12551247

1248+
#: main.c
1249+
msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
1250+
msgstr ""
1251+
12561252
#: shared-bindings/wifi/Radio.c
12571253
msgid "Invalid MAC address"
12581254
msgstr ""
@@ -2741,7 +2737,7 @@ msgstr ""
27412737
msgid "can't set attribute"
27422738
msgstr ""
27432739

2744-
#: py/runtime.c
2740+
#: py/runtime.c shared-bindings/supervisor/Runtime.c
27452741
msgid "can't set attribute '%q'"
27462742
msgstr ""
27472743

@@ -4115,10 +4111,6 @@ msgstr ""
41154111
msgid "tobytes can be invoked for dense arrays only"
41164112
msgstr ""
41174113

4118-
#: shared-module/struct/__init__.c
4119-
msgid "too many arguments provided with the given format"
4120-
msgstr ""
4121-
41224114
#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/create.c
41234115
msgid "too many dimensions"
41244116
msgstr ""

locale/cs.po

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,6 @@ msgstr ""
3232
"\n"
3333
"Kód byl zastaven kvůli automatickému načtení. K načtení dojde brzy.\n"
3434

35-
#: main.c
36-
msgid ""
37-
"\n"
38-
"Invalid CIRCUITPY_PYSTACK_SIZE\n"
39-
"\n"
40-
"\r"
41-
msgstr ""
42-
4335
#: supervisor/shared/safe_mode.c
4436
msgid ""
4537
"\n"
@@ -1264,6 +1256,10 @@ msgstr "Chybný BLE parametr"
12641256
msgid "Invalid BSSID"
12651257
msgstr "Chybné BSSID"
12661258

1259+
#: main.c
1260+
msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
1261+
msgstr ""
1262+
12671263
#: shared-bindings/wifi/Radio.c
12681264
msgid "Invalid MAC address"
12691265
msgstr "Chybná MAC adresa"

locale/de_DE.po

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,6 @@ msgstr ""
3131
"\n"
3232
"Code wurde durch automatisches Neuladen gestoppt. Wird bald neu geladen.\n"
3333

34-
#: main.c
35-
msgid ""
36-
"\n"
37-
"Invalid CIRCUITPY_PYSTACK_SIZE\n"
38-
"\n"
39-
"\r"
40-
msgstr ""
41-
"\n"
42-
"Ungültige CIRCUITPY_PYSTACK_SIZE\n"
43-
"\n"
44-
"\n"
45-
4634
#: supervisor/shared/safe_mode.c
4735
msgid ""
4836
"\n"
@@ -1287,6 +1275,10 @@ msgstr "Ungültiges BLE Parameter"
12871275
msgid "Invalid BSSID"
12881276
msgstr "Ungültige BSSID"
12891277

1278+
#: main.c
1279+
msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
1280+
msgstr ""
1281+
12901282
#: shared-bindings/wifi/Radio.c
12911283
msgid "Invalid MAC address"
12921284
msgstr "Ungültige MAC-Adresse"
@@ -4473,6 +4465,17 @@ msgstr "zi muss eine Gleitkommazahl sein"
44734465
msgid "zi must be of shape (n_section, 2)"
44744466
msgstr "zi muss die Form (n_section, 2) haben"
44754467

4468+
#~ msgid ""
4469+
#~ "\n"
4470+
#~ "Invalid CIRCUITPY_PYSTACK_SIZE\n"
4471+
#~ "\n"
4472+
#~ "\r"
4473+
#~ msgstr ""
4474+
#~ "\n"
4475+
#~ "Ungültige CIRCUITPY_PYSTACK_SIZE\n"
4476+
#~ "\n"
4477+
#~ "\n"
4478+
44764479
#~ msgid "Supply at least one UART pin"
44774480
#~ msgstr "Gib mindestens einen UART-Pin an"
44784481

locale/el.po

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@ msgstr ""
3535
"Ο κώδικας σταμάτησε λόγω της αυτόματης επαναφόρτωσης. Η επαναφόρτωση θα "
3636
"γίνει σύντομα.\n"
3737

38-
#: main.c
39-
msgid ""
40-
"\n"
41-
"Invalid CIRCUITPY_PYSTACK_SIZE\n"
42-
"\n"
43-
"\r"
44-
msgstr ""
45-
4638
#: supervisor/shared/safe_mode.c
4739
msgid ""
4840
"\n"
@@ -1273,6 +1265,10 @@ msgstr ""
12731265
msgid "Invalid BSSID"
12741266
msgstr ""
12751267

1268+
#: main.c
1269+
msgid "Invalid CIRCUITPY_PYSTACK_SIZE\n"
1270+
msgstr ""
1271+
12761272
#: shared-bindings/wifi/Radio.c
12771273
msgid "Invalid MAC address"
12781274
msgstr ""

0 commit comments

Comments
 (0)