Skip to content

Commit ecc219f

Browse files
hierophecthierophect
committed
Merge remote-tracking branch 'upstream/main' into esp32-displayio-fix
2 parents f95ad7b + 94e2613 commit ecc219f

135 files changed

Lines changed: 5354 additions & 477 deletions

File tree

Some content is hidden

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

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ jobs:
275275
- "pyportal"
276276
- "pyportal_titano"
277277
- "pyruler"
278+
- "qtpy_m0"
278279
- "raytac_mdbt50q-db-40"
279280
- "robohatmm1_m4"
280281
- "sam32"

‎.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",

‎devices/ble_hci/common-hal/_bleio/att.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,6 +1748,7 @@ void check_att_err(uint8_t err) {
17481748
break;
17491749
case BT_ATT_ERR_ENCRYPTION_KEY_SIZE:
17501750
msg = translate("Encryption key size");
1751+
break;
17511752
case BT_ATT_ERR_INVALID_ATTRIBUTE_LEN:
17521753
msg = translate("Invalid attribute length");
17531754
break;

‎extmod/re1.5/recursiveloop.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ recursiveloop(char *pc, const char *sp, Subject *input, const char **subp, int n
2222
case Char:
2323
if(*sp != *pc++)
2424
return 0;
25+
/* FALLTHROUGH */
2526
case Any:
2627
sp++;
2728
continue;

‎frozen/Adafruit_CircuitPython_RFM69‎

‎lib/tinyusb‎

‎locale/ID.po‎

Lines changed: 55 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-08-30 14:38-0400\n"
8+
"POT-Creation-Date: 2020-09-13 14:21-0500\n"
99
"PO-Revision-Date: 2020-07-06 18:10+0000\n"
1010
"Last-Translator: oon arfiandwi <oon.arfiandwi@gmail.com>\n"
1111
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,14 +34,6 @@ msgstr ""
3434
"Harap ajukan masalah dengan konten drive CIRCUITPY Anda di\n"
3535
"https://github.com/adafruit/circuitpython/issues\n"
3636

37-
#: supervisor/shared/safe_mode.c
38-
msgid ""
39-
"\n"
40-
"To exit, please reset the board without "
41-
msgstr ""
42-
"\n"
43-
"Untuk keluar, harap setel ulang papan tanpa"
44-
4537
#: py/obj.c
4638
msgid " File \"%q\""
4739
msgstr " File \"%q\""
@@ -279,7 +271,7 @@ msgstr "pow() 3-arg tidak didukung"
279271
msgid "A hardware interrupt channel is already in use"
280272
msgstr "Sebuah channel hardware interrupt sedang digunakan"
281273

282-
#: shared-bindings/_bleio/Address.c
274+
#: shared-bindings/_bleio/Address.c shared-bindings/ipaddress/IPv4Address.c
283275
#, c-format
284276
msgid "Address must be %d bytes long"
285277
msgstr "Alamat harus sepanjang %d byte"
@@ -377,6 +369,10 @@ msgstr ""
377369
msgid "Attempted heap allocation when MicroPython VM not running."
378370
msgstr "Mencoba alokasi heap ketika MicroPython VM tidak berjalan."
379371

372+
#: shared-bindings/wifi/Radio.c
373+
msgid "Authentication failure"
374+
msgstr ""
375+
380376
#: main.c
381377
msgid "Auto-reload is off.\n"
382378
msgstr "Auto-reload tidak aktif.\n"
@@ -596,6 +592,10 @@ msgstr ""
596592
"CircuitPython dalam mode aman karena Anda menekan tombol reset saat boot. "
597593
"Tekan lagi untuk keluar dari mode aman.\n"
598594

595+
#: supervisor/shared/safe_mode.c
596+
msgid "CircuitPython was unable to allocate the heap.\n"
597+
msgstr ""
598+
599599
#: shared-module/bitbangio/SPI.c
600600
msgid "Clock pin init failed."
601601
msgstr "Init pin clock gagal."
@@ -1244,6 +1244,10 @@ msgstr ""
12441244
msgid "No more timers available on this pin."
12451245
msgstr ""
12461246

1247+
#: shared-bindings/wifi/Radio.c
1248+
msgid "No network with that ssid"
1249+
msgstr ""
1250+
12471251
#: shared-module/touchio/TouchIn.c
12481252
msgid "No pulldown on pin; 1Mohm recommended"
12491253
msgstr ""
@@ -1264,6 +1268,10 @@ msgstr ""
12641268
msgid "Nordic Soft Device failure assertion."
12651269
msgstr ""
12661270

1271+
#: shared-bindings/ipaddress/IPv4Address.c shared-bindings/ipaddress/__init__.c
1272+
msgid "Not a valid IP string"
1273+
msgstr ""
1274+
12671275
#: ports/nrf/common-hal/_bleio/__init__.c
12681276
#: shared-bindings/_bleio/CharacteristicBuffer.c
12691277
#, fuzzy
@@ -1309,6 +1317,10 @@ msgid ""
13091317
"%d bpp given"
13101318
msgstr ""
13111319

1320+
#: shared-bindings/ipaddress/__init__.c
1321+
msgid "Only raw int supported for ip"
1322+
msgstr ""
1323+
13121324
#: shared-bindings/audiobusio/PDMIn.c
13131325
msgid "Oversample must be multiple of 8."
13141326
msgstr ""
@@ -1508,6 +1520,10 @@ msgstr ""
15081520
msgid "Serializer in use"
15091521
msgstr "Serializer sedang digunakan"
15101522

1523+
#: shared-bindings/ssl/SSLContext.c
1524+
msgid "Server side context cannot have hostname"
1525+
msgstr ""
1526+
15111527
#: shared-bindings/nvm/ByteArray.c
15121528
msgid "Slice and value different lengths."
15131529
msgstr ""
@@ -1608,6 +1624,10 @@ msgid ""
16081624
"Timer was reserved for internal use - declare PWM pins earlier in the program"
16091625
msgstr ""
16101626

1627+
#: supervisor/shared/safe_mode.c
1628+
msgid "To exit, please reset the board without "
1629+
msgstr "Untuk keluar, silahkan reset board tanpa "
1630+
16111631
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
16121632
msgid "Too many channels in sample."
16131633
msgstr "Terlalu banyak channel dalam sampel"
@@ -1703,6 +1723,10 @@ msgstr ""
17031723
msgid "Unexpected nrfx uuid type"
17041724
msgstr ""
17051725

1726+
#: shared-bindings/wifi/Radio.c
1727+
msgid "Unknown failure"
1728+
msgstr ""
1729+
17061730
#: ports/nrf/common-hal/_bleio/__init__.c
17071731
#, c-format
17081732
msgid "Unknown gatt error: 0x%04x"
@@ -1813,6 +1837,10 @@ msgstr ""
18131837
"\n"
18141838
"Untuk menampilkan modul built-in silahkan ketik `help(\"modules\")`.\n"
18151839

1840+
#: shared-bindings/wifi/Radio.c
1841+
msgid "WiFi password must be between 8 and 63 characters"
1842+
msgstr ""
1843+
18161844
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
18171845
msgid "Writes not supported on Characteristic"
18181846
msgstr ""
@@ -1927,7 +1955,7 @@ msgstr ""
19271955
msgid "bad format string"
19281956
msgstr ""
19291957

1930-
#: py/binary.c
1958+
#: py/binary.c py/objarray.c
19311959
msgid "bad typecode"
19321960
msgstr "typecode buruk"
19331961

@@ -1981,6 +2009,10 @@ msgstr ""
19812009
msgid "bytes > 8 bits not supported"
19822010
msgstr "byte > 8 bit tidak didukung"
19832011

2012+
#: py/objarray.c
2013+
msgid "bytes length not a multiple of item size"
2014+
msgstr ""
2015+
19842016
#: py/objstr.c
19852017
msgid "bytes value out of range"
19862018
msgstr ""
@@ -2947,6 +2979,11 @@ msgstr ""
29472979
msgid "overflow converting long int to machine word"
29482980
msgstr ""
29492981

2982+
#: py/modstruct.c
2983+
#, c-format
2984+
msgid "pack expected %d items for packing (got %d)"
2985+
msgstr ""
2986+
29502987
#: shared-bindings/_stage/Layer.c shared-bindings/_stage/Text.c
29512988
msgid "palette must be 32 bytes long"
29522989
msgstr ""
@@ -3421,6 +3458,13 @@ msgstr ""
34213458
msgid "zi must be of shape (n_section, 2)"
34223459
msgstr ""
34233460

3461+
#~ msgid ""
3462+
#~ "\n"
3463+
#~ "To exit, please reset the board without "
3464+
#~ msgstr ""
3465+
#~ "\n"
3466+
#~ "Untuk keluar, harap setel ulang papan tanpa"
3467+
34243468
#~ msgid "%q indices must be integers, not %s"
34253469
#~ msgstr "indeks %q harus bilangan bulat, bukan %s"
34263470

@@ -3680,9 +3724,6 @@ msgstr ""
36803724
#~ "Tegangan dari mikrokontroler turun atau mati. Pastikan sumber tegangan "
36813725
#~ "memberikan daya\n"
36823726

3683-
#~ msgid "To exit, please reset the board without "
3684-
#~ msgstr "Untuk keluar, silahkan reset board tanpa "
3685-
36863727
#~ msgid "UART(%d) does not exist"
36873728
#~ msgstr "UART(%d) tidak ada"
36883729

‎locale/circuitpython.pot‎

Lines changed: 48 additions & 9 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-13 14:21-0500\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,12 +30,6 @@ msgid ""
3030
"https://github.com/adafruit/circuitpython/issues\n"
3131
msgstr ""
3232

33-
#: supervisor/shared/safe_mode.c
34-
msgid ""
35-
"\n"
36-
"To exit, please reset the board without "
37-
msgstr ""
38-
3933
#: py/obj.c
4034
msgid " File \"%q\""
4135
msgstr ""
@@ -273,7 +267,7 @@ msgstr ""
273267
msgid "A hardware interrupt channel is already in use"
274268
msgstr ""
275269

276-
#: shared-bindings/_bleio/Address.c
270+
#: shared-bindings/_bleio/Address.c shared-bindings/ipaddress/IPv4Address.c
277271
#, c-format
278272
msgid "Address must be %d bytes long"
279273
msgstr ""
@@ -371,6 +365,10 @@ msgstr ""
371365
msgid "Attempted heap allocation when MicroPython VM not running."
372366
msgstr ""
373367

368+
#: shared-bindings/wifi/Radio.c
369+
msgid "Authentication failure"
370+
msgstr ""
371+
374372
#: main.c
375373
msgid "Auto-reload is off.\n"
376374
msgstr ""
@@ -578,6 +576,10 @@ msgid ""
578576
"boot. Press again to exit safe mode.\n"
579577
msgstr ""
580578

579+
#: supervisor/shared/safe_mode.c
580+
msgid "CircuitPython was unable to allocate the heap.\n"
581+
msgstr ""
582+
581583
#: shared-module/bitbangio/SPI.c
582584
msgid "Clock pin init failed."
583585
msgstr ""
@@ -1221,6 +1223,10 @@ msgstr ""
12211223
msgid "No more timers available on this pin."
12221224
msgstr ""
12231225

1226+
#: shared-bindings/wifi/Radio.c
1227+
msgid "No network with that ssid"
1228+
msgstr ""
1229+
12241230
#: shared-module/touchio/TouchIn.c
12251231
msgid "No pulldown on pin; 1Mohm recommended"
12261232
msgstr ""
@@ -1241,6 +1247,10 @@ msgstr ""
12411247
msgid "Nordic Soft Device failure assertion."
12421248
msgstr ""
12431249

1250+
#: shared-bindings/ipaddress/IPv4Address.c shared-bindings/ipaddress/__init__.c
1251+
msgid "Not a valid IP string"
1252+
msgstr ""
1253+
12441254
#: ports/nrf/common-hal/_bleio/__init__.c
12451255
#: shared-bindings/_bleio/CharacteristicBuffer.c
12461256
msgid "Not connected"
@@ -1285,6 +1295,10 @@ msgid ""
12851295
"%d bpp given"
12861296
msgstr ""
12871297

1298+
#: shared-bindings/ipaddress/__init__.c
1299+
msgid "Only raw int supported for ip"
1300+
msgstr ""
1301+
12881302
#: shared-bindings/audiobusio/PDMIn.c
12891303
msgid "Oversample must be multiple of 8."
12901304
msgstr ""
@@ -1481,6 +1495,10 @@ msgstr ""
14811495
msgid "Serializer in use"
14821496
msgstr ""
14831497

1498+
#: shared-bindings/ssl/SSLContext.c
1499+
msgid "Server side context cannot have hostname"
1500+
msgstr ""
1501+
14841502
#: shared-bindings/nvm/ByteArray.c
14851503
msgid "Slice and value different lengths."
14861504
msgstr ""
@@ -1581,6 +1599,10 @@ msgid ""
15811599
"Timer was reserved for internal use - declare PWM pins earlier in the program"
15821600
msgstr ""
15831601

1602+
#: supervisor/shared/safe_mode.c
1603+
msgid "To exit, please reset the board without "
1604+
msgstr ""
1605+
15841606
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
15851607
msgid "Too many channels in sample."
15861608
msgstr ""
@@ -1676,6 +1698,10 @@ msgstr ""
16761698
msgid "Unexpected nrfx uuid type"
16771699
msgstr ""
16781700

1701+
#: shared-bindings/wifi/Radio.c
1702+
msgid "Unknown failure"
1703+
msgstr ""
1704+
16791705
#: ports/nrf/common-hal/_bleio/__init__.c
16801706
#, c-format
16811707
msgid "Unknown gatt error: 0x%04x"
@@ -1779,6 +1805,10 @@ msgid ""
17791805
"To list built-in modules please do `help(\"modules\")`.\n"
17801806
msgstr ""
17811807

1808+
#: shared-bindings/wifi/Radio.c
1809+
msgid "WiFi password must be between 8 and 63 characters"
1810+
msgstr ""
1811+
17821812
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
17831813
msgid "Writes not supported on Characteristic"
17841814
msgstr ""
@@ -1893,7 +1923,7 @@ msgstr ""
18931923
msgid "bad format string"
18941924
msgstr ""
18951925

1896-
#: py/binary.c
1926+
#: py/binary.c py/objarray.c
18971927
msgid "bad typecode"
18981928
msgstr ""
18991929

@@ -1946,6 +1976,10 @@ msgstr ""
19461976
msgid "bytes > 8 bits not supported"
19471977
msgstr ""
19481978

1979+
#: py/objarray.c
1980+
msgid "bytes length not a multiple of item size"
1981+
msgstr ""
1982+
19491983
#: py/objstr.c
19501984
msgid "bytes value out of range"
19511985
msgstr ""
@@ -2911,6 +2945,11 @@ msgstr ""
29112945
msgid "overflow converting long int to machine word"
29122946
msgstr ""
29132947

2948+
#: py/modstruct.c
2949+
#, c-format
2950+
msgid "pack expected %d items for packing (got %d)"
2951+
msgstr ""
2952+
29142953
#: shared-bindings/_stage/Layer.c shared-bindings/_stage/Text.c
29152954
msgid "palette must be 32 bytes long"
29162955
msgstr ""

0 commit comments

Comments
 (0)