Skip to content

Commit 72bda34

Browse files
authored
Merge pull request #26 from adafruit/main
update from adafruit/main
2 parents 7c162cd + 9256e6b commit 72bda34

File tree

98 files changed

+4176
-136
lines changed

Some content is hidden

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

98 files changed

+4176
-136
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,3 +150,6 @@
150150
[submodule "frozen/Adafruit_CircuitPython_RFM9x"]
151151
path = frozen/Adafruit_CircuitPython_RFM9x
152152
url = https://github.com/adafruit/Adafruit_CircuitPython_RFM9x.git
153+
[submodule "frozen/Adafruit_CircuitPython_RFM69"]
154+
path = frozen/Adafruit_CircuitPython_RFM69
155+
url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git

conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@
146146
# directories to ignore when looking for source files.
147147
exclude_patterns = ["**/build*",
148148
".git",
149+
".env",
149150
".venv",
150151
".direnv",
151152
"docs/autoapi",

docs/shared_bindings_matrix.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ def get_circuitpython_root_dir():
4343
def get_shared_bindings():
4444
""" Get a list of modules in shared-bindings based on folder names
4545
"""
46-
shared_bindings_dir = get_circuitpython_root_dir() / "circuitpython-stubs"
47-
return [item.name for item in shared_bindings_dir.iterdir()]
46+
shared_bindings_dir = get_circuitpython_root_dir() / "shared-bindings"
47+
return [item.name for item in shared_bindings_dir.iterdir()] + ["ulab"]
4848

4949

5050
def read_mpconfig():
@@ -159,6 +159,8 @@ def support_matrix(arg):
159159
board_contents)
160160
if board_name_re:
161161
board_name = board_name_re.group(1).strip('"')
162+
else:
163+
board_name = entry.name
162164

163165
board_modules = []
164166
for module in base:

locale/circuitpython.pot

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-08-30 14:38-0400\n"
11+
"POT-Creation-Date: 2020-09-09 14:33-0700\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -273,7 +273,7 @@ msgstr ""
273273
msgid "A hardware interrupt channel is already in use"
274274
msgstr ""
275275

276-
#: shared-bindings/_bleio/Address.c
276+
#: shared-bindings/_bleio/Address.c shared-bindings/ipaddress/IPv4Address.c
277277
#, c-format
278278
msgid "Address must be %d bytes long"
279279
msgstr ""
@@ -371,6 +371,10 @@ msgstr ""
371371
msgid "Attempted heap allocation when MicroPython VM not running."
372372
msgstr ""
373373

374+
#: shared-bindings/wifi/Radio.c
375+
msgid "Authentication failure"
376+
msgstr ""
377+
374378
#: main.c
375379
msgid "Auto-reload is off.\n"
376380
msgstr ""
@@ -578,6 +582,10 @@ msgid ""
578582
"boot. Press again to exit safe mode.\n"
579583
msgstr ""
580584

585+
#: supervisor/shared/safe_mode.c
586+
msgid "CircuitPython was unable to allocate the heap.\n"
587+
msgstr ""
588+
581589
#: shared-module/bitbangio/SPI.c
582590
msgid "Clock pin init failed."
583591
msgstr ""
@@ -1221,6 +1229,10 @@ msgstr ""
12211229
msgid "No more timers available on this pin."
12221230
msgstr ""
12231231

1232+
#: shared-bindings/wifi/Radio.c
1233+
msgid "No network with that ssid"
1234+
msgstr ""
1235+
12241236
#: shared-module/touchio/TouchIn.c
12251237
msgid "No pulldown on pin; 1Mohm recommended"
12261238
msgstr ""
@@ -1241,6 +1253,10 @@ msgstr ""
12411253
msgid "Nordic Soft Device failure assertion."
12421254
msgstr ""
12431255

1256+
#: shared-bindings/ipaddress/IPv4Address.c shared-bindings/ipaddress/__init__.c
1257+
msgid "Not a valid IP string"
1258+
msgstr ""
1259+
12441260
#: ports/nrf/common-hal/_bleio/__init__.c
12451261
#: shared-bindings/_bleio/CharacteristicBuffer.c
12461262
msgid "Not connected"
@@ -1285,6 +1301,10 @@ msgid ""
12851301
"%d bpp given"
12861302
msgstr ""
12871303

1304+
#: shared-bindings/ipaddress/__init__.c
1305+
msgid "Only raw int supported for ip"
1306+
msgstr ""
1307+
12881308
#: shared-bindings/audiobusio/PDMIn.c
12891309
msgid "Oversample must be multiple of 8."
12901310
msgstr ""
@@ -1481,6 +1501,10 @@ msgstr ""
14811501
msgid "Serializer in use"
14821502
msgstr ""
14831503

1504+
#: shared-bindings/ssl/SSLContext.c
1505+
msgid "Server side context cannot have hostname"
1506+
msgstr ""
1507+
14841508
#: shared-bindings/nvm/ByteArray.c
14851509
msgid "Slice and value different lengths."
14861510
msgstr ""
@@ -1676,6 +1700,10 @@ msgstr ""
16761700
msgid "Unexpected nrfx uuid type"
16771701
msgstr ""
16781702

1703+
#: shared-bindings/wifi/Radio.c
1704+
msgid "Unknown failure"
1705+
msgstr ""
1706+
16791707
#: ports/nrf/common-hal/_bleio/__init__.c
16801708
#, c-format
16811709
msgid "Unknown gatt error: 0x%04x"
@@ -1779,6 +1807,10 @@ msgid ""
17791807
"To list built-in modules please do `help(\"modules\")`.\n"
17801808
msgstr ""
17811809

1810+
#: shared-bindings/wifi/Radio.c
1811+
msgid "WiFi password must be between 8 and 63 characters"
1812+
msgstr ""
1813+
17821814
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
17831815
msgid "Writes not supported on Characteristic"
17841816
msgstr ""

locale/cs.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ msgstr ""
4444

4545
#: py/obj.c
4646
msgid " File \"%q\""
47-
msgstr "  Soubor \"%q\""
47+
msgstr " Soubor \"%q\""
4848

4949
#: py/obj.c
5050
msgid " File \"%q\", line %d"
51-
msgstr "  Soubor \"%q\", řádek %d"
51+
msgstr " Soubor \"%q\", řádek %d"
5252

5353
#: main.c
5454
msgid " output:\n"
55-
msgstr " výstup:\n"
55+
msgstr " výstup:\n"
5656

5757
#: py/objstr.c
5858
#, c-format

locale/nl.po

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
88
"POT-Creation-Date: 2020-08-30 14:38-0400\n"
9-
"PO-Revision-Date: 2020-08-10 19:59+0000\n"
10-
"Last-Translator: _fonzlate <[email protected]>\n"
9+
"PO-Revision-Date: 2020-09-09 16:05+0000\n"
10+
"Last-Translator: Jelle Jager <[email protected]>\n"
1111
"Language-Team: none\n"
1212
"Language: nl\n"
1313
"MIME-Version: 1.0\n"
1414
"Content-Type: text/plain; charset=UTF-8\n"
1515
"Content-Transfer-Encoding: 8bit\n"
1616
"Plural-Forms: nplurals=2; plural=n != 1;\n"
17-
"X-Generator: Weblate 4.2-dev\n"
17+
"X-Generator: Weblate 4.3-dev\n"
1818

1919
#: main.c
2020
msgid ""
@@ -456,10 +456,8 @@ msgid "Buffer length must be a multiple of 512"
456456
msgstr "Buffer lengte moet een veelvoud van 512 zijn"
457457

458458
#: ports/stm/common-hal/sdioio/SDCard.c
459-
#, fuzzy
460-
#| msgid "Buffer length must be a multiple of 512"
461459
msgid "Buffer must be a multiple of 512 bytes"
462-
msgstr "Buffer lengte moet een veelvoud van 512 zijn"
460+
msgstr "Buffer moet een veelvoud van 512 zijn"
463461

464462
#: shared-bindings/bitbangio/I2C.c shared-bindings/busio/I2C.c
465463
msgid "Buffer must be at least length 1"
@@ -502,7 +500,7 @@ msgstr "Kan CCCD niet toewijzen aan lokaal Characteristic"
502500

503501
#: shared-bindings/_bleio/Adapter.c
504502
msgid "Cannot create a new Adapter; use _bleio.adapter;"
505-
msgstr ""
503+
msgstr "Kan geen nieuwe Adapter creëren; gebruik _bleio.adapter;"
506504

507505
#: shared-bindings/displayio/Bitmap.c
508506
#: shared-bindings/memorymonitor/AllocationSize.c
@@ -662,10 +660,8 @@ msgid "Could not restart PWM"
662660
msgstr "Kan PWM niet herstarten"
663661

664662
#: shared-bindings/_bleio/Adapter.c
665-
#, fuzzy
666-
#| msgid "Could not start PWM"
667663
msgid "Could not set address"
668-
msgstr "Kan PWM niet starten"
664+
msgstr "Kan adres niet zetten"
669665

670666
#: ports/stm/common-hal/pwmio/PWMOut.c
671667
msgid "Could not start PWM"
@@ -778,15 +774,15 @@ msgstr "Verwachtte een Characteristic"
778774

779775
#: shared-bindings/_bleio/Adapter.c
780776
msgid "Expected a DigitalInOut"
781-
msgstr ""
777+
msgstr "Verwachtte een DigitalInOut"
782778

783779
#: shared-bindings/_bleio/Characteristic.c
784780
msgid "Expected a Service"
785781
msgstr "Verwachtte een Service"
786782

787783
#: shared-bindings/_bleio/Adapter.c
788784
msgid "Expected a UART"
789-
msgstr ""
785+
msgstr "Verwachtte een UART"
790786

791787
#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c
792788
#: shared-bindings/_bleio/Service.c
@@ -860,7 +856,7 @@ msgstr "Bestand bestaat"
860856
#: shared-module/framebufferio/FramebufferDisplay.c
861857
#, c-format
862858
msgid "Framebuffer requires %d bytes"
863-
msgstr ""
859+
msgstr "Framebuffer benodigd %d bytes"
864860

865861
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
866862
msgid "Frequency captured is above capability. Capture Paused."
@@ -957,10 +953,8 @@ msgstr "Ongeldige %q pin"
957953

958954
#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c
959955
#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/sdioio/SDCard.c
960-
#, fuzzy
961-
#| msgid "Invalid I2C pin selection"
962956
msgid "Invalid %q pin selection"
963-
msgstr "Ongeldige I2C pin selectie"
957+
msgstr "Ongeldige %q pin selectie"
964958

965959
#: ports/stm/common-hal/analogio/AnalogIn.c
966960
msgid "Invalid ADC Unit value"
@@ -1478,13 +1472,12 @@ msgstr "SDA of SCL hebben een pullup nodig"
14781472
#: ports/stm/common-hal/sdioio/SDCard.c
14791473
#, c-format
14801474
msgid "SDIO GetCardInfo Error %d"
1481-
msgstr ""
1475+
msgstr "SDIO GetCardInfo Fout %d"
14821476

14831477
#: ports/stm/common-hal/sdioio/SDCard.c
1484-
#, fuzzy, c-format
1485-
#| msgid "SPI Init Error"
1478+
#, c-format
14861479
msgid "SDIO Init Error %d"
1487-
msgstr "SPI Init Fout"
1480+
msgstr "SDIO Init Fout %d"
14881481

14891482
#: ports/stm/common-hal/busio/SPI.c
14901483
msgid "SPI Init Error"
@@ -2731,7 +2724,7 @@ msgstr "max_length moet 0-%d zijn als fixed_length %s is"
27312724

27322725
#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c
27332726
msgid "max_length must be > 0"
2734-
msgstr ""
2727+
msgstr "max_length moet >0 zijn"
27352728

27362729
#: py/runtime.c
27372730
msgid "maximum recursion depth exceeded"

locale/pl.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1971,7 +1971,7 @@ msgstr "wartość kalibracji poza zakresem +/-127"
19711971

19721972
#: py/emitinlinethumb.c
19731973
msgid "can only have up to 4 parameters to Thumb assembly"
1974-
msgstr "asembler Thumb może przyjąć do 4 parameterów"
1974+
msgstr "asembler Thumb może przyjąć do 4 parameterów"
19751975

19761976
#: py/emitinlinextensa.c
19771977
msgid "can only have up to 4 parameters to Xtensa assembly"
@@ -3562,7 +3562,7 @@ msgstr ""
35623562
#~ msgstr "Nie udało się odkryć serwisów"
35633563

35643564
#~ msgid "Failed to get local address"
3565-
#~ msgstr "Nie udało się uzyskać lokalnego adresu"
3565+
#~ msgstr "Nie udało się uzyskać lokalnego adresu"
35663566

35673567
#~ msgid "Failed to get softdevice state"
35683568
#~ msgstr "Nie udało się odczytać stanu softdevice"
@@ -3610,7 +3610,7 @@ msgstr ""
36103610
#~ msgstr "Nie udało się zapisać gatts, błąd 0x%04x"
36113611

36123612
#~ msgid "Flash erase failed"
3613-
#~ msgstr "Nie udało się skasować flash"
3613+
#~ msgstr "Nie udało się skasować flash"
36143614

36153615
#~ msgid "Flash erase failed to start, err 0x%04x"
36163616
#~ msgstr "Nie udało się rozpocząć kasowania flash, błąd 0x%04x"

0 commit comments

Comments
 (0)