Skip to content

Commit 0f66832

Browse files
dhalbertdhalbert
authored
Merge branch 'main' into hid_devices-gc
2 parents 7d0cda2 + 0d92558 commit 0f66832

File tree

85 files changed

+791
-1293
lines changed

Some content is hidden

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

85 files changed

+791
-1293
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ jobs:
190190
- "arduino_mkrzero"
191191
- "arduino_nano_33_ble"
192192
- "arduino_nano_33_iot"
193+
- "arduino_nano_rp2040_connect"
193194
- "arduino_zero"
194195
- "bast_pro_mini_m0"
195196
- "bastble"

‎data/nvm.toml

‎docs/troubleshooting.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ This error occurs when importing a module that is stored as a ``mpy`` binary fil
4545
(rather than a ``py`` text file) that was generated by a different version of
4646
CircuitPython than the one it's being loaded into. Most versions are compatible
4747
but, rarely they aren't. In particular, the ``mpy`` binary format changed between
48-
CircuitPython versions 1.x and 2.x, and will change again between 2.x and 3.x.
48+
CircuitPython versions 1.x and 2.x, 2.x and 3.x, and will change again between 6.x and 7.x.
4949

50-
So, for instance, if you just upgraded to CircuitPython 2.x from 1.x you'll need to download a
50+
So, for instance, if you just upgraded to CircuitPython 7.x from 6.x you'll need to download a
5151
newer version of the library that triggered the error on ``import``. They are
5252
all available in the
5353
`Adafruit bundle <https://github.com/adafruit/Adafruit_CircuitPython_Bundle/releases/latest>`_
5454
and the `Community bundle <https://github.com/adafruit/CircuitPython_Community_Bundle/releases/latest>`_.
55-
Make sure to download a version with 2.0.0 or higher in the filename.
55+
Make sure to download a version with 7.0.0 or higher in the filename.

‎locale/ID.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1719,7 +1719,7 @@ msgid "Only one color can be transparent at a time"
17191719
msgstr ""
17201720

17211721
#: shared-bindings/ipaddress/__init__.c
1722-
msgid "Only raw int supported for ip"
1722+
msgid "Only raw int or string supported for ip"
17231723
msgstr ""
17241724

17251725
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c

‎locale/circuitpython.pot

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1672,6 +1672,10 @@ msgstr ""
16721672
msgid "Only edge detection is available on this hardware"
16731673
msgstr ""
16741674

1675+
#: shared-bindings/ipaddress/__init__.c
1676+
msgid "Only int or string supported for ip"
1677+
msgstr ""
1678+
16751679
#: shared-module/displayio/OnDiskBitmap.c
16761680
#, c-format
16771681
msgid ""
@@ -1693,10 +1697,6 @@ msgstr ""
16931697
msgid "Only one color can be transparent at a time"
16941698
msgstr ""
16951699

1696-
#: shared-bindings/ipaddress/__init__.c
1697-
msgid "Only raw int supported for ip"
1698-
msgstr ""
1699-
17001700
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
17011701
msgid "Operation or feature not supported"
17021702
msgstr ""

‎locale/cs.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1697,7 +1697,7 @@ msgid "Only one color can be transparent at a time"
16971697
msgstr ""
16981698

16991699
#: shared-bindings/ipaddress/__init__.c
1700-
msgid "Only raw int supported for ip"
1700+
msgid "Only raw int or string supported for ip"
17011701
msgstr ""
17021702

17031703
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c

‎locale/de_DE.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1721,7 +1721,7 @@ msgid "Only one color can be transparent at a time"
17211721
msgstr ""
17221722

17231723
#: shared-bindings/ipaddress/__init__.c
1724-
msgid "Only raw int supported for ip"
1724+
msgid "Only raw int or string supported for ip"
17251725
msgstr ""
17261726

17271727
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c

‎locale/el.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1694,7 +1694,7 @@ msgid "Only one color can be transparent at a time"
16941694
msgstr ""
16951695

16961696
#: shared-bindings/ipaddress/__init__.c
1697-
msgid "Only raw int supported for ip"
1697+
msgid "Only raw int or string supported for ip"
16981698
msgstr ""
16991699

17001700
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c

‎locale/en_GB.po

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,8 +1713,8 @@ msgid "Only one color can be transparent at a time"
17131713
msgstr "Only one colour can be transparent at a time"
17141714

17151715
#: shared-bindings/ipaddress/__init__.c
1716-
msgid "Only raw int supported for ip"
1717-
msgstr "Only raw int supported for ip"
1716+
msgid "Only raw int or string supported for ip"
1717+
msgstr ""
17181718

17191719
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
17201720
msgid "Operation or feature not supported"
@@ -4393,6 +4393,9 @@ msgstr "zi must be of float type"
43934393
msgid "zi must be of shape (n_section, 2)"
43944394
msgstr "zi must be of shape (n_section, 2)"
43954395

4396+
#~ msgid "Only raw int supported for ip"
4397+
#~ msgstr "Only raw int supported for ip"
4398+
43964399
#~ msgid ""
43974400
#~ "CircuitPython is in safe mode because you pressed the reset button during "
43984401
#~ "boot. Press again to exit safe mode.\n"

‎locale/es.po

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
11-
"PO-Revision-Date: 2021-05-15 15:52+0000\n"
11+
"PO-Revision-Date: 2021-05-22 17:58+0000\n"
1212
"Last-Translator: Alvaro Figueroa <[email protected]>\n"
1313
"Language-Team: \n"
1414
"Language: es\n"
@@ -1246,7 +1246,7 @@ msgstr "AuthMode invalido"
12461246

12471247
#: ports/nrf/common-hal/_bleio/__init__.c
12481248
msgid "Invalid BLE parameter"
1249-
msgstr ""
1249+
msgstr "Parámetro BLE invalido"
12501250

12511251
#: shared-module/displayio/OnDiskBitmap.c
12521252
msgid "Invalid BMP file"
@@ -1737,8 +1737,8 @@ msgid "Only one color can be transparent at a time"
17371737
msgstr "Solo un color puede ser transparente a la vez"
17381738

17391739
#: shared-bindings/ipaddress/__init__.c
1740-
msgid "Only raw int supported for ip"
1741-
msgstr "Solo se aceptan enteros crudos para ip"
1740+
msgid "Only raw int or string supported for ip"
1741+
msgstr "Para ip solo puede con un entero o una cadena"
17421742

17431743
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
17441744
msgid "Operation or feature not supported"
@@ -4448,6 +4448,9 @@ msgstr "zi debe ser de tipo flotante"
44484448
msgid "zi must be of shape (n_section, 2)"
44494449
msgstr "zi debe ser una forma (n_section,2)"
44504450

4451+
#~ msgid "Only raw int supported for ip"
4452+
#~ msgstr "Solo se aceptan enteros crudos para ip"
4453+
44514454
#~ msgid ""
44524455
#~ "CircuitPython is in safe mode because you pressed the reset button during "
44534456
#~ "boot. Press again to exit safe mode.\n"

‎locale/fil.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1712,7 +1712,7 @@ msgid "Only one color can be transparent at a time"
17121712
msgstr ""
17131713

17141714
#: shared-bindings/ipaddress/__init__.c
1715-
msgid "Only raw int supported for ip"
1715+
msgid "Only raw int or string supported for ip"
17161716
msgstr ""
17171717

17181718
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c

‎locale/fr.po

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ msgstr ""
88
"Project-Id-Version: 0.1\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
11-
"PO-Revision-Date: 2021-05-20 13:02+0000\n"
12-
"Last-Translator: Noel Gaetan <[email protected]>\n"
11+
"PO-Revision-Date: 2021-05-21 17:47+0000\n"
12+
"Last-Translator: Hugo Dahl <[email protected]>\n"
1313
"Language: fr\n"
1414
"MIME-Version: 1.0\n"
1515
"Content-Type: text/plain; charset=utf-8\n"
@@ -116,7 +116,7 @@ msgstr "%q doit être >= 1"
116116

117117
#: shared-bindings/usb_hid/Device.c
118118
msgid "%q must be None or 1-255"
119-
msgstr "%q doit être NULL ou compris entre 1 et 255"
119+
msgstr "%q doit être None ou compris entre 1 et 255"
120120

121121
#: shared-module/vectorio/Polygon.c
122122
msgid "%q must be a tuple of length 2"
@@ -1745,8 +1745,8 @@ msgid "Only one color can be transparent at a time"
17451745
msgstr "Une seule couleur peut être transparente à la fois"
17461746

17471747
#: shared-bindings/ipaddress/__init__.c
1748-
msgid "Only raw int supported for ip"
1749-
msgstr "IP n'accepte que les chiffres entiers bruts"
1748+
msgid "Only raw int or string supported for ip"
1749+
msgstr ""
17501750

17511751
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
17521752
msgid "Operation or feature not supported"
@@ -4459,6 +4459,9 @@ msgstr "zi doit être de type float"
44594459
msgid "zi must be of shape (n_section, 2)"
44604460
msgstr "zi doit être de forme (n_section, 2)"
44614461

4462+
#~ msgid "Only raw int supported for ip"
4463+
#~ msgstr "IP n'accepte que les chiffres entiers bruts"
4464+
44624465
#~ msgid ""
44634466
#~ "CircuitPython is in safe mode because you pressed the reset button during "
44644467
#~ "boot. Press again to exit safe mode.\n"

‎locale/hi.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1694,7 +1694,7 @@ msgid "Only one color can be transparent at a time"
16941694
msgstr ""
16951695

16961696
#: shared-bindings/ipaddress/__init__.c
1697-
msgid "Only raw int supported for ip"
1697+
msgid "Only raw int or string supported for ip"
16981698
msgstr ""
16991699

17001700
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c

‎locale/it_IT.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1726,7 +1726,7 @@ msgid "Only one color can be transparent at a time"
17261726
msgstr ""
17271727

17281728
#: shared-bindings/ipaddress/__init__.c
1729-
msgid "Only raw int supported for ip"
1729+
msgid "Only raw int or string supported for ip"
17301730
msgstr ""
17311731

17321732
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c

‎locale/ja.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1707,7 +1707,7 @@ msgid "Only one color can be transparent at a time"
17071707
msgstr ""
17081708

17091709
#: shared-bindings/ipaddress/__init__.c
1710-
msgid "Only raw int supported for ip"
1710+
msgid "Only raw int or string supported for ip"
17111711
msgstr ""
17121712

17131713
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c

‎locale/ko.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1697,7 +1697,7 @@ msgid "Only one color can be transparent at a time"
16971697
msgstr ""
16981698

16991699
#: shared-bindings/ipaddress/__init__.c
1700-
msgid "Only raw int supported for ip"
1700+
msgid "Only raw int or string supported for ip"
17011701
msgstr ""
17021702

17031703
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c

‎locale/nl.po

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1712,8 +1712,8 @@ msgid "Only one color can be transparent at a time"
17121712
msgstr "Er kan maar één kleur per keer transparant zijn"
17131713

17141714
#: shared-bindings/ipaddress/__init__.c
1715-
msgid "Only raw int supported for ip"
1716-
msgstr "Alleen raw int ondersteund voor IP"
1715+
msgid "Only raw int or string supported for ip"
1716+
msgstr ""
17171717

17181718
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
17191719
msgid "Operation or feature not supported"
@@ -4404,6 +4404,9 @@ msgstr "zi moet van type float zijn"
44044404
msgid "zi must be of shape (n_section, 2)"
44054405
msgstr "zi moet vorm (n_section, 2) hebben"
44064406

4407+
#~ msgid "Only raw int supported for ip"
4408+
#~ msgstr "Alleen raw int ondersteund voor IP"
4409+
44074410
#~ msgid ""
44084411
#~ "CircuitPython is in safe mode because you pressed the reset button during "
44094412
#~ "boot. Press again to exit safe mode.\n"

‎locale/pl.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1705,7 +1705,7 @@ msgid "Only one color can be transparent at a time"
17051705
msgstr "W danym momencie przezroczysty może być tylko jeden kolor"
17061706

17071707
#: shared-bindings/ipaddress/__init__.c
1708-
msgid "Only raw int supported for ip"
1708+
msgid "Only raw int or string supported for ip"
17091709
msgstr ""
17101710

17111711
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c

‎locale/pt_BR.po

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
88
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
9-
"PO-Revision-Date: 2021-05-20 13:02+0000\n"
9+
"PO-Revision-Date: 2021-05-22 17:58+0000\n"
1010
"Last-Translator: Wellington Terumi Uemura <[email protected]>\n"
1111
"Language-Team: \n"
1212
"Language: pt_BR\n"
@@ -1735,8 +1735,8 @@ msgid "Only one color can be transparent at a time"
17351735
msgstr "Apenas uma cor pode ser transparente de cada vez"
17361736

17371737
#: shared-bindings/ipaddress/__init__.c
1738-
msgid "Only raw int supported for ip"
1739-
msgstr "Apenas o int bruto é compatível para o ip"
1738+
msgid "Only raw int or string supported for ip"
1739+
msgstr "Apenas int ou string bruto é compatível para o ip"
17401740

17411741
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
17421742
msgid "Operation or feature not supported"
@@ -4458,6 +4458,9 @@ msgstr "zi deve ser de um tipo float"
44584458
msgid "zi must be of shape (n_section, 2)"
44594459
msgstr "zi deve estar na forma (n_section, 2)"
44604460

4461+
#~ msgid "Only raw int supported for ip"
4462+
#~ msgstr "Apenas o int bruto é compatível para o ip"
4463+
44614464
#~ msgid ""
44624465
#~ "CircuitPython is in safe mode because you pressed the reset button during "
44634466
#~ "boot. Press again to exit safe mode.\n"

‎locale/sv.po

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
88
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
9-
"PO-Revision-Date: 2021-05-20 13:02+0000\n"
9+
"PO-Revision-Date: 2021-05-22 17:58+0000\n"
1010
"Last-Translator: Jonny Bergdahl <[email protected]>\n"
1111
"Language-Team: LANGUAGE <[email protected]>\n"
1212
"Language: sv\n"
@@ -1719,8 +1719,8 @@ msgid "Only one color can be transparent at a time"
17191719
msgstr "Bara en färg kan vara genomskinlig i taget"
17201720

17211721
#: shared-bindings/ipaddress/__init__.c
1722-
msgid "Only raw int supported for ip"
1723-
msgstr "Endast raw int stöds för ip"
1722+
msgid "Only raw int or string supported for ip"
1723+
msgstr "Enbart int eller string stöds för ip"
17241724

17251725
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
17261726
msgid "Operation or feature not supported"
@@ -4417,6 +4417,9 @@ msgstr "zi måste vara av typ float"
44174417
msgid "zi must be of shape (n_section, 2)"
44184418
msgstr "zi måste vara i formen (n_section, 2)"
44194419

4420+
#~ msgid "Only raw int supported for ip"
4421+
#~ msgstr "Endast raw int stöds för ip"
4422+
44204423
#~ msgid ""
44214424
#~ "CircuitPython is in safe mode because you pressed the reset button during "
44224425
#~ "boot. Press again to exit safe mode.\n"

0 commit comments

Comments
 (0)