Skip to content

Commit 7e18bed

Browse files
todbottodbot
authored
Merge branch 'adafruit:main' into touchio_pullup_rp2350
2 parents 0bd7d7e + ba483d5 commit 7e18bed

File tree

68 files changed

+1110
-265
lines changed

Some content is hidden

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

68 files changed

+1110
-265
lines changed

‎docs/shared_bindings_matrix.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666

6767
ADDITIONAL_MODULES = {
6868
"_asyncio": "MICROPY_PY_ASYNCIO",
69+
"_bleio (native)": "CIRCUITPY_BLEIO_NATIVE",
70+
"_bleio (HCI co-processor)": "CIRCUITPY_BLEIO_HCI",
6971
"_eve": "CIRCUITPY__EVE",
7072
"adafruit_bus_device": "CIRCUITPY_BUSDEVICE",
7173
"adafruit_pixelbuf": "CIRCUITPY_PIXELBUF",

‎locale/ID.po

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1394,6 +1394,11 @@ msgstr ""
13941394
msgid "MITM security not supported"
13951395
msgstr ""
13961396

1397+
#: ports/stm/common-hal/sdioio/SDCard.c
1398+
#, c-format
1399+
msgid "MMC/SDIO Clock Error %x"
1400+
msgstr ""
1401+
13971402
#: shared-bindings/is31fl3741/IS31FL3741.c
13981403
msgid "Mapping must be a tuple"
13991404
msgstr ""

‎locale/circuitpython.pot

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,6 +1369,11 @@ msgstr ""
13691369
msgid "MITM security not supported"
13701370
msgstr ""
13711371

1372+
#: ports/stm/common-hal/sdioio/SDCard.c
1373+
#, c-format
1374+
msgid "MMC/SDIO Clock Error %x"
1375+
msgstr ""
1376+
13721377
#: shared-bindings/is31fl3741/IS31FL3741.c
13731378
msgid "Mapping must be a tuple"
13741379
msgstr ""

‎locale/cs.po

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,6 +1389,11 @@ msgstr "MAC adresa byla chybná"
13891389
msgid "MITM security not supported"
13901390
msgstr ""
13911391

1392+
#: ports/stm/common-hal/sdioio/SDCard.c
1393+
#, c-format
1394+
msgid "MMC/SDIO Clock Error %x"
1395+
msgstr ""
1396+
13921397
#: shared-bindings/is31fl3741/IS31FL3741.c
13931398
msgid "Mapping must be a tuple"
13941399
msgstr ""

‎locale/de_DE.po

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,6 +1400,11 @@ msgstr "MAC Adresse war ungültig"
14001400
msgid "MITM security not supported"
14011401
msgstr "MITM-Sicherheit wird nicht unterstützt"
14021402

1403+
#: ports/stm/common-hal/sdioio/SDCard.c
1404+
#, c-format
1405+
msgid "MMC/SDIO Clock Error %x"
1406+
msgstr ""
1407+
14031408
#: shared-bindings/is31fl3741/IS31FL3741.c
14041409
msgid "Mapping must be a tuple"
14051410
msgstr "Zuordnung muss ein Tupel sein"

‎locale/el.po

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,6 +1395,11 @@ msgstr ""
13951395
msgid "MITM security not supported"
13961396
msgstr ""
13971397

1398+
#: ports/stm/common-hal/sdioio/SDCard.c
1399+
#, c-format
1400+
msgid "MMC/SDIO Clock Error %x"
1401+
msgstr ""
1402+
13981403
#: shared-bindings/is31fl3741/IS31FL3741.c
13991404
msgid "Mapping must be a tuple"
14001405
msgstr ""

‎locale/en_GB.po

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1388,6 +1388,11 @@ msgstr "MAC address was invalid"
13881388
msgid "MITM security not supported"
13891389
msgstr "MITM security is not supported"
13901390

1391+
#: ports/stm/common-hal/sdioio/SDCard.c
1392+
#, c-format
1393+
msgid "MMC/SDIO Clock Error %x"
1394+
msgstr ""
1395+
13911396
#: shared-bindings/is31fl3741/IS31FL3741.c
13921397
msgid "Mapping must be a tuple"
13931398
msgstr "Mapping must be a tuple"

‎locale/es.po

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1411,6 +1411,11 @@ msgstr "La dirección MAC es incorrecta"
14111411
msgid "MITM security not supported"
14121412
msgstr "Seguridad MITM no compatible"
14131413

1414+
#: ports/stm/common-hal/sdioio/SDCard.c
1415+
#, c-format
1416+
msgid "MMC/SDIO Clock Error %x"
1417+
msgstr ""
1418+
14141419
#: shared-bindings/is31fl3741/IS31FL3741.c
14151420
msgid "Mapping must be a tuple"
14161421
msgstr "El mapping debe ser una dupla"

‎locale/fil.po

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1381,6 +1381,11 @@ msgstr ""
13811381
msgid "MITM security not supported"
13821382
msgstr ""
13831383

1384+
#: ports/stm/common-hal/sdioio/SDCard.c
1385+
#, c-format
1386+
msgid "MMC/SDIO Clock Error %x"
1387+
msgstr ""
1388+
13841389
#: shared-bindings/is31fl3741/IS31FL3741.c
13851390
msgid "Mapping must be a tuple"
13861391
msgstr ""

‎locale/fr.po

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,6 +1414,11 @@ msgstr "MAC Address invalide"
14141414
msgid "MITM security not supported"
14151415
msgstr "Sécurité MITM n'est pas supportée"
14161416

1417+
#: ports/stm/common-hal/sdioio/SDCard.c
1418+
#, c-format
1419+
msgid "MMC/SDIO Clock Error %x"
1420+
msgstr ""
1421+
14171422
#: shared-bindings/is31fl3741/IS31FL3741.c
14181423
msgid "Mapping must be a tuple"
14191424
msgstr "Le mapping doit être un tuple"

0 commit comments

Comments
 (0)