Skip to content

Commit b9968ea

Browse files
astrobokononastrobokonon
committed
Merge branch 'main' of https://github.com/adafruit/circuitpython into esp32s2-morenet
2 parents a77966a + dab4d0e commit b9968ea

Some content is hidden

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

79 files changed

+3782
-161
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ jobs:
279279
- "pyportal_titano"
280280
- "pyruler"
281281
- "qtpy_m0"
282+
- "qtpy_m0_haxpress"
282283
- "raytac_mdbt50q-db-40"
283284
- "robohatmm1_m4"
284285
- "sam32"

‎locale/ID.po

Lines changed: 32 additions & 4 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-09-16 17:07-0700\n"
8+
"POT-Creation-Date: 2020-09-21 16:45-0500\n"
99
"PO-Revision-Date: 2020-07-06 18:10+0000\n"
1010
"Last-Translator: oon arfiandwi <[email protected]>\n"
1111
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -96,7 +96,11 @@ msgstr "%q harus >= 1"
9696
msgid "%q must be a tuple of length 2"
9797
msgstr "%q harus berupa tuple dengan panjang 2"
9898

99-
#: ports/atmel-samd/common-hal/sdioio/SDCard.c
99+
#: shared-bindings/canio/Match.c
100+
msgid "%q out of range"
101+
msgstr ""
102+
103+
#: ports/atmel-samd/common-hal/microcontroller/Pin.c
100104
msgid "%q pin invalid"
101105
msgstr "pin %q tidak valid"
102106

@@ -284,6 +288,10 @@ msgstr "Jenis alamat di luar batas"
284288
msgid "All I2C peripherals are in use"
285289
msgstr "Semua perangkat I2C sedang digunakan"
286290

291+
#: ports/atmel-samd/common-hal/canio/Listener.c
292+
msgid "All RX FIFOs in use"
293+
msgstr ""
294+
287295
#: ports/nrf/common-hal/busio/SPI.c
288296
msgid "All SPI peripherals are in use"
289297
msgstr "Semua perangkat SPI sedang digunakan"
@@ -320,6 +328,10 @@ msgstr "Semua timer sedang digunakan"
320328
msgid "Already advertising."
321329
msgstr "Sudah disebarkan."
322330

331+
#: ports/atmel-samd/common-hal/canio/Listener.c
332+
msgid "Already have all-matches listener"
333+
msgstr ""
334+
323335
#: shared-module/memorymonitor/AllocationAlarm.c
324336
#: shared-module/memorymonitor/AllocationSize.c
325337
msgid "Already running"
@@ -770,7 +782,7 @@ msgstr "Channel EXTINT sedang digunakan"
770782
msgid "Error in regex"
771783
msgstr "Error pada regex"
772784

773-
#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
785+
#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
774786
#: shared-bindings/busio/SPI.c shared-bindings/microcontroller/Pin.c
775787
#: shared-bindings/neopixel_write/__init__.c
776788
#: shared-bindings/terminalio/Terminal.c
@@ -863,6 +875,10 @@ msgstr "Gagal menulis flash internal."
863875
msgid "File exists"
864876
msgstr "File sudah ada"
865877

878+
#: ports/atmel-samd/common-hal/canio/Listener.c
879+
msgid "Filters too complex"
880+
msgstr ""
881+
866882
#: ports/cxd56/common-hal/camera/Camera.c
867883
msgid "Format not supported"
868884
msgstr ""
@@ -1148,6 +1164,10 @@ msgstr "Pin MOSI gagal inisialisasi."
11481164
msgid "Maximum x value when mirrored is %d"
11491165
msgstr "Nilai x maksimum ketika dicerminkan adalah %d"
11501166

1167+
#: shared-bindings/canio/Message.c
1168+
msgid "Messages limited to 8 bytes"
1169+
msgstr ""
1170+
11511171
#: supervisor/shared/safe_mode.c
11521172
msgid "MicroPython NLR jump failed. Likely memory corruption."
11531173
msgstr "Lompatan NLR MicroPython gagal. Kemungkinan kerusakan memori."
@@ -2343,6 +2363,10 @@ msgstr "error = 0x%08lX"
23432363
msgid "exceptions must derive from BaseException"
23442364
msgstr ""
23452365

2366+
#: shared-bindings/canio/CAN.c shared-bindings/canio/Listener.c
2367+
msgid "expected '%q' but got '%q'"
2368+
msgstr ""
2369+
23462370
#: py/objstr.c
23472371
msgid "expected ':' after format specifier"
23482372
msgstr ""
@@ -3181,6 +3205,10 @@ msgstr ""
31813205
msgid "source palette too large"
31823206
msgstr ""
31833207

3208+
#: shared-bindings/canio/Message.c
3209+
msgid "specify size or data, but not both"
3210+
msgstr ""
3211+
31843212
#: py/objstr.c
31853213
msgid "start/end indices"
31863214
msgstr ""
@@ -3296,7 +3324,7 @@ msgid "tuple/list has wrong length"
32963324
msgstr ""
32973325

32983326
#: ports/atmel-samd/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
3299-
#: shared-bindings/busio/UART.c
3327+
#: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
33003328
msgid "tx and rx cannot both be None"
33013329
msgstr "tx dan rx keduanya tidak boleh kosong"
33023330

‎locale/circuitpython.pot

Lines changed: 33 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-09-16 17:07-0700\n"
11+
"POT-Creation-Date: 2020-09-24 16:55-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 <[email protected]>\n"
@@ -92,7 +92,11 @@ msgstr ""
9292
msgid "%q must be a tuple of length 2"
9393
msgstr ""
9494

95-
#: ports/atmel-samd/common-hal/sdioio/SDCard.c
95+
#: shared-bindings/canio/Match.c
96+
msgid "%q out of range"
97+
msgstr ""
98+
99+
#: ports/atmel-samd/common-hal/microcontroller/Pin.c
96100
msgid "%q pin invalid"
97101
msgstr ""
98102

@@ -280,6 +284,10 @@ msgstr ""
280284
msgid "All I2C peripherals are in use"
281285
msgstr ""
282286

287+
#: ports/atmel-samd/common-hal/canio/Listener.c
288+
msgid "All RX FIFOs in use"
289+
msgstr ""
290+
283291
#: ports/nrf/common-hal/busio/SPI.c
284292
msgid "All SPI peripherals are in use"
285293
msgstr ""
@@ -316,6 +324,10 @@ msgstr ""
316324
msgid "Already advertising."
317325
msgstr ""
318326

327+
#: ports/atmel-samd/common-hal/canio/Listener.c
328+
msgid "Already have all-matches listener"
329+
msgstr ""
330+
319331
#: shared-module/memorymonitor/AllocationAlarm.c
320332
#: shared-module/memorymonitor/AllocationSize.c
321333
msgid "Already running"
@@ -752,7 +764,7 @@ msgstr ""
752764
msgid "Error in regex"
753765
msgstr ""
754766

755-
#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
767+
#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
756768
#: shared-bindings/busio/SPI.c shared-bindings/microcontroller/Pin.c
757769
#: shared-bindings/neopixel_write/__init__.c
758770
#: shared-bindings/terminalio/Terminal.c
@@ -845,6 +857,10 @@ msgstr ""
845857
msgid "File exists"
846858
msgstr ""
847859

860+
#: ports/atmel-samd/common-hal/canio/Listener.c
861+
msgid "Filters too complex"
862+
msgstr ""
863+
848864
#: ports/cxd56/common-hal/camera/Camera.c
849865
msgid "Format not supported"
850866
msgstr ""
@@ -1127,6 +1143,10 @@ msgstr ""
11271143
msgid "Maximum x value when mirrored is %d"
11281144
msgstr ""
11291145

1146+
#: shared-bindings/canio/Message.c
1147+
msgid "Messages limited to 8 bytes"
1148+
msgstr ""
1149+
11301150
#: supervisor/shared/safe_mode.c
11311151
msgid "MicroPython NLR jump failed. Likely memory corruption."
11321152
msgstr ""
@@ -1147,14 +1167,10 @@ msgstr ""
11471167
msgid "Must be a %q subclass."
11481168
msgstr ""
11491169

1150-
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c
1170+
#: ports/mimxrt10xx/common-hal/busio/SPI.c shared-bindings/busio/SPI.c
11511171
msgid "Must provide MISO or MOSI pin"
11521172
msgstr ""
11531173

1154-
#: ports/stm/common-hal/busio/SPI.c
1155-
msgid "Must provide SCK pin"
1156-
msgstr ""
1157-
11581174
#: shared-bindings/rgbmatrix/RGBMatrix.c
11591175
#, c-format
11601176
msgid "Must use a multiple of 6 rgb pins, not %d"
@@ -2310,6 +2326,10 @@ msgstr ""
23102326
msgid "exceptions must derive from BaseException"
23112327
msgstr ""
23122328

2329+
#: shared-bindings/canio/CAN.c shared-bindings/canio/Listener.c
2330+
msgid "expected '%q' but got '%q'"
2331+
msgstr ""
2332+
23132333
#: py/objstr.c
23142334
msgid "expected ':' after format specifier"
23152335
msgstr ""
@@ -3147,6 +3167,10 @@ msgstr ""
31473167
msgid "source palette too large"
31483168
msgstr ""
31493169

3170+
#: shared-bindings/canio/Message.c
3171+
msgid "specify size or data, but not both"
3172+
msgstr ""
3173+
31503174
#: py/objstr.c
31513175
msgid "start/end indices"
31523176
msgstr ""
@@ -3261,7 +3285,7 @@ msgid "tuple/list has wrong length"
32613285
msgstr ""
32623286

32633287
#: ports/atmel-samd/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
3264-
#: shared-bindings/busio/UART.c
3288+
#: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
32653289
msgid "tx and rx cannot both be None"
32663290
msgstr ""
32673291

‎locale/cs.po

Lines changed: 32 additions & 4 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-09-16 17:07-0700\n"
8+
"POT-Creation-Date: 2020-09-21 16:45-0500\n"
99
"PO-Revision-Date: 2020-05-24 03:22+0000\n"
1010
"Last-Translator: dronecz <[email protected]>\n"
1111
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -96,7 +96,11 @@ msgstr " %q musí být > = 1"
9696
msgid "%q must be a tuple of length 2"
9797
msgstr " %q musí být n-tice délky 2"
9898

99-
#: ports/atmel-samd/common-hal/sdioio/SDCard.c
99+
#: shared-bindings/canio/Match.c
100+
msgid "%q out of range"
101+
msgstr ""
102+
103+
#: ports/atmel-samd/common-hal/microcontroller/Pin.c
100104
msgid "%q pin invalid"
101105
msgstr ""
102106

@@ -284,6 +288,10 @@ msgstr ""
284288
msgid "All I2C peripherals are in use"
285289
msgstr ""
286290

291+
#: ports/atmel-samd/common-hal/canio/Listener.c
292+
msgid "All RX FIFOs in use"
293+
msgstr ""
294+
287295
#: ports/nrf/common-hal/busio/SPI.c
288296
msgid "All SPI peripherals are in use"
289297
msgstr ""
@@ -320,6 +328,10 @@ msgstr ""
320328
msgid "Already advertising."
321329
msgstr ""
322330

331+
#: ports/atmel-samd/common-hal/canio/Listener.c
332+
msgid "Already have all-matches listener"
333+
msgstr ""
334+
323335
#: shared-module/memorymonitor/AllocationAlarm.c
324336
#: shared-module/memorymonitor/AllocationSize.c
325337
msgid "Already running"
@@ -756,7 +768,7 @@ msgstr ""
756768
msgid "Error in regex"
757769
msgstr ""
758770

759-
#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
771+
#: py/enum.c shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
760772
#: shared-bindings/busio/SPI.c shared-bindings/microcontroller/Pin.c
761773
#: shared-bindings/neopixel_write/__init__.c
762774
#: shared-bindings/terminalio/Terminal.c
@@ -849,6 +861,10 @@ msgstr ""
849861
msgid "File exists"
850862
msgstr ""
851863

864+
#: ports/atmel-samd/common-hal/canio/Listener.c
865+
msgid "Filters too complex"
866+
msgstr ""
867+
852868
#: ports/cxd56/common-hal/camera/Camera.c
853869
msgid "Format not supported"
854870
msgstr ""
@@ -1131,6 +1147,10 @@ msgstr ""
11311147
msgid "Maximum x value when mirrored is %d"
11321148
msgstr ""
11331149

1150+
#: shared-bindings/canio/Message.c
1151+
msgid "Messages limited to 8 bytes"
1152+
msgstr ""
1153+
11341154
#: supervisor/shared/safe_mode.c
11351155
msgid "MicroPython NLR jump failed. Likely memory corruption."
11361156
msgstr ""
@@ -2314,6 +2334,10 @@ msgstr ""
23142334
msgid "exceptions must derive from BaseException"
23152335
msgstr ""
23162336

2337+
#: shared-bindings/canio/CAN.c shared-bindings/canio/Listener.c
2338+
msgid "expected '%q' but got '%q'"
2339+
msgstr ""
2340+
23172341
#: py/objstr.c
23182342
msgid "expected ':' after format specifier"
23192343
msgstr ""
@@ -3151,6 +3175,10 @@ msgstr ""
31513175
msgid "source palette too large"
31523176
msgstr ""
31533177

3178+
#: shared-bindings/canio/Message.c
3179+
msgid "specify size or data, but not both"
3180+
msgstr ""
3181+
31543182
#: py/objstr.c
31553183
msgid "start/end indices"
31563184
msgstr ""
@@ -3265,7 +3293,7 @@ msgid "tuple/list has wrong length"
32653293
msgstr ""
32663294

32673295
#: ports/atmel-samd/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
3268-
#: shared-bindings/busio/UART.c
3296+
#: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
32693297
msgid "tx and rx cannot both be None"
32703298
msgstr ""
32713299

0 commit comments

Comments
 (0)