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 <alvaro@greencore.co.cr>\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"

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy