Skip to content

Commit 1303fe5

Browse files
ladyadaladyada
authored
Merge branch 'adafruit:main' into main
2 parents dd266f2 + 8de3467 commit 1303fe5

File tree

90 files changed

+1576
-1439
lines changed

Some content is hidden

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

90 files changed

+1576
-1439
lines changed

‎lib/tinyusb

Submodule tinyusb updated 57 files

‎locale/ID.po

Lines changed: 34 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,10 @@ msgstr ""
129129

130130
#: ports/espressif/common-hal/espulp/ULP.c
131131
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
132+
#: ports/mimxrt10xx/common-hal/usb_host/Port.c
132133
#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
133134
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
135+
#: ports/raspberrypi/common-hal/usb_host/Port.c
134136
#: shared-bindings/digitalio/DigitalInOut.c
135137
#: shared-bindings/microcontroller/Pin.c
136138
msgid "%q in use"
@@ -185,6 +187,7 @@ msgid "%q must be 1 when %q is True"
185187
msgstr ""
186188

187189
#: py/argcheck.c shared-bindings/gifio/GifWriter.c
190+
#: shared-module/gifio/OnDiskGif.c
188191
msgid "%q must be <= %d"
189192
msgstr "%q harus <= %d"
190193

@@ -786,10 +789,6 @@ msgstr "Tidak dapat menentukan RTS atau CTS dalam mode RS485"
786789
msgid "Cannot subclass slice"
787790
msgstr "Tidak dapat membuat subkelas dari irisan"
788791

789-
#: shared-module/bitbangio/SPI.c
790-
msgid "Cannot transfer without MOSI and MISO pins"
791-
msgstr ""
792-
793792
#: shared-bindings/pwmio/PWMOut.c
794793
msgid "Cannot vary frequency on a timer that is already in use"
795794
msgstr ""
@@ -1100,13 +1099,10 @@ msgstr "Grup sudah digunakan"
11001099
msgid "Half duplex SPI is not implemented"
11011100
msgstr ""
11021101

1103-
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/I2C.c
1104-
#: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/canio/CAN.c
1105-
#: ports/stm/common-hal/sdioio/SDCard.c
1106-
msgid "Hardware busy, try alternative pins"
1107-
msgstr "Perangkat keras sibuk, coba pin alternatif"
1108-
1109-
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
1102+
#: ports/mimxrt10xx/common-hal/busio/SPI.c
1103+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/I2C.c
1104+
#: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/busio/UART.c
1105+
#: ports/stm/common-hal/canio/CAN.c ports/stm/common-hal/sdioio/SDCard.c
11101106
msgid "Hardware in use, try alternative pins"
11111107
msgstr "Perangkat keras sedang digunakan, coba pin alternatif"
11121108

@@ -1367,14 +1363,6 @@ msgstr ""
13671363
msgid "Mismatched swap flag"
13681364
msgstr ""
13691365

1370-
#: ports/mimxrt10xx/common-hal/busio/SPI.c
1371-
msgid "Missing MISO or MOSI Pin"
1372-
msgstr "Tidak menemukan Pin MISO atau MOSI"
1373-
1374-
#: ports/stm/common-hal/busio/SPI.c
1375-
msgid "Missing MISO or MOSI pin"
1376-
msgstr ""
1377-
13781366
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
13791367
#, c-format
13801368
msgid "Missing first_in_pin. Instruction %d reads pin(s)"
@@ -1448,6 +1436,14 @@ msgid "Nimble out of memory"
14481436
msgstr ""
14491437

14501438
#: ports/atmel-samd/common-hal/busio/UART.c
1439+
#: ports/espressif/common-hal/busio/SPI.c
1440+
#: ports/espressif/common-hal/busio/UART.c
1441+
#: ports/mimxrt10xx/common-hal/busio/SPI.c
1442+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
1443+
#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c
1444+
#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c
1445+
#: shared-bindings/displayio/I2CDisplay.c
1446+
#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c
14511447
msgid "No %q pin"
14521448
msgstr "Tidak pin %q"
14531449

@@ -1481,36 +1477,6 @@ msgstr ""
14811477
msgid "No IP"
14821478
msgstr ""
14831479

1484-
#: ports/espressif/common-hal/busio/SPI.c
1485-
#: ports/mimxrt10xx/common-hal/busio/SPI.c
1486-
msgid "No MISO Pin"
1487-
msgstr "Tidak ada Pin MISO"
1488-
1489-
#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
1490-
msgid "No MISO pin"
1491-
msgstr ""
1492-
1493-
#: ports/espressif/common-hal/busio/SPI.c
1494-
#: ports/mimxrt10xx/common-hal/busio/SPI.c
1495-
msgid "No MOSI Pin"
1496-
msgstr "Tidak ada Pin MOSI"
1497-
1498-
#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
1499-
msgid "No MOSI pin"
1500-
msgstr ""
1501-
1502-
#: ports/espressif/common-hal/busio/UART.c
1503-
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
1504-
#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
1505-
msgid "No RX pin"
1506-
msgstr "Tidak pin RX"
1507-
1508-
#: ports/espressif/common-hal/busio/UART.c
1509-
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
1510-
#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
1511-
msgid "No TX pin"
1512-
msgstr "Tidak ada pin TX"
1513-
15141480
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
15151481
msgid "No available clocks"
15161482
msgstr "Tidak ada clocks yang tersedia"
@@ -2433,6 +2399,7 @@ msgstr ""
24332399
#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
24342400
#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
24352401
#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
2402+
#: ports/espressif/boards/m5stack_stick_c_plus/mpconfigboard.h
24362403
msgid "You pressed button A at start up."
24372404
msgstr ""
24382405

@@ -3656,11 +3623,6 @@ msgstr ""
36563623
msgid "no module named '%q'"
36573624
msgstr "tidak ada modul yang bernama '%q'"
36583625

3659-
#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c
3660-
#: shared-bindings/paralleldisplay/ParallelBus.c
3661-
msgid "no reset pin available"
3662-
msgstr ""
3663-
36643626
#: shared-module/sdcardio/SDCard.c
36653627
msgid "no response from SD card"
36663628
msgstr ""
@@ -4387,6 +4349,24 @@ msgstr "zi harus berjenis float"
43874349
msgid "zi must be of shape (n_section, 2)"
43884350
msgstr "Zi harus berbentuk (n_section, 2)"
43894351

4352+
#~ msgid "Hardware busy, try alternative pins"
4353+
#~ msgstr "Perangkat keras sibuk, coba pin alternatif"
4354+
4355+
#~ msgid "Missing MISO or MOSI Pin"
4356+
#~ msgstr "Tidak menemukan Pin MISO atau MOSI"
4357+
4358+
#~ msgid "No MISO Pin"
4359+
#~ msgstr "Tidak ada Pin MISO"
4360+
4361+
#~ msgid "No MOSI Pin"
4362+
#~ msgstr "Tidak ada Pin MOSI"
4363+
4364+
#~ msgid "No RX pin"
4365+
#~ msgstr "Tidak pin RX"
4366+
4367+
#~ msgid "No TX pin"
4368+
#~ msgstr "Tidak ada pin TX"
4369+
43904370
#~ msgid "Brightness must be 0-1.0"
43914371
#~ msgstr "Kecerahan harus di antara 0-1.0"
43924372

‎locale/circuitpython.pot

Lines changed: 16 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,10 @@ msgstr ""
126126

127127
#: ports/espressif/common-hal/espulp/ULP.c
128128
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
129+
#: ports/mimxrt10xx/common-hal/usb_host/Port.c
129130
#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c
130131
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
132+
#: ports/raspberrypi/common-hal/usb_host/Port.c
131133
#: shared-bindings/digitalio/DigitalInOut.c
132134
#: shared-bindings/microcontroller/Pin.c
133135
msgid "%q in use"
@@ -182,6 +184,7 @@ msgid "%q must be 1 when %q is True"
182184
msgstr ""
183185

184186
#: py/argcheck.c shared-bindings/gifio/GifWriter.c
187+
#: shared-module/gifio/OnDiskGif.c
185188
msgid "%q must be <= %d"
186189
msgstr ""
187190

@@ -779,10 +782,6 @@ msgstr ""
779782
msgid "Cannot subclass slice"
780783
msgstr ""
781784

782-
#: shared-module/bitbangio/SPI.c
783-
msgid "Cannot transfer without MOSI and MISO pins"
784-
msgstr ""
785-
786785
#: shared-bindings/pwmio/PWMOut.c
787786
msgid "Cannot vary frequency on a timer that is already in use"
788787
msgstr ""
@@ -1090,13 +1089,10 @@ msgstr ""
10901089
msgid "Half duplex SPI is not implemented"
10911090
msgstr ""
10921091

1093-
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/I2C.c
1094-
#: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/canio/CAN.c
1095-
#: ports/stm/common-hal/sdioio/SDCard.c
1096-
msgid "Hardware busy, try alternative pins"
1097-
msgstr ""
1098-
1099-
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
1092+
#: ports/mimxrt10xx/common-hal/busio/SPI.c
1093+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/I2C.c
1094+
#: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/busio/UART.c
1095+
#: ports/stm/common-hal/canio/CAN.c ports/stm/common-hal/sdioio/SDCard.c
11001096
msgid "Hardware in use, try alternative pins"
11011097
msgstr ""
11021098

@@ -1355,14 +1351,6 @@ msgstr ""
13551351
msgid "Mismatched swap flag"
13561352
msgstr ""
13571353

1358-
#: ports/mimxrt10xx/common-hal/busio/SPI.c
1359-
msgid "Missing MISO or MOSI Pin"
1360-
msgstr ""
1361-
1362-
#: ports/stm/common-hal/busio/SPI.c
1363-
msgid "Missing MISO or MOSI pin"
1364-
msgstr ""
1365-
13661354
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
13671355
#, c-format
13681356
msgid "Missing first_in_pin. Instruction %d reads pin(s)"
@@ -1436,6 +1424,14 @@ msgid "Nimble out of memory"
14361424
msgstr ""
14371425

14381426
#: ports/atmel-samd/common-hal/busio/UART.c
1427+
#: ports/espressif/common-hal/busio/SPI.c
1428+
#: ports/espressif/common-hal/busio/UART.c
1429+
#: ports/mimxrt10xx/common-hal/busio/SPI.c
1430+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
1431+
#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c
1432+
#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c
1433+
#: shared-bindings/displayio/I2CDisplay.c
1434+
#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c
14391435
msgid "No %q pin"
14401436
msgstr ""
14411437

@@ -1469,36 +1465,6 @@ msgstr ""
14691465
msgid "No IP"
14701466
msgstr ""
14711467

1472-
#: ports/espressif/common-hal/busio/SPI.c
1473-
#: ports/mimxrt10xx/common-hal/busio/SPI.c
1474-
msgid "No MISO Pin"
1475-
msgstr ""
1476-
1477-
#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
1478-
msgid "No MISO pin"
1479-
msgstr ""
1480-
1481-
#: ports/espressif/common-hal/busio/SPI.c
1482-
#: ports/mimxrt10xx/common-hal/busio/SPI.c
1483-
msgid "No MOSI Pin"
1484-
msgstr ""
1485-
1486-
#: ports/stm/common-hal/busio/SPI.c shared-module/bitbangio/SPI.c
1487-
msgid "No MOSI pin"
1488-
msgstr ""
1489-
1490-
#: ports/espressif/common-hal/busio/UART.c
1491-
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
1492-
#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
1493-
msgid "No RX pin"
1494-
msgstr ""
1495-
1496-
#: ports/espressif/common-hal/busio/UART.c
1497-
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
1498-
#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
1499-
msgid "No TX pin"
1500-
msgstr ""
1501-
15021468
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
15031469
msgid "No available clocks"
15041470
msgstr ""
@@ -2405,6 +2371,7 @@ msgstr ""
24052371
#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
24062372
#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
24072373
#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
2374+
#: ports/espressif/boards/m5stack_stick_c_plus/mpconfigboard.h
24082375
msgid "You pressed button A at start up."
24092376
msgstr ""
24102377

@@ -3628,11 +3595,6 @@ msgstr ""
36283595
msgid "no module named '%q'"
36293596
msgstr ""
36303597

3631-
#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c
3632-
#: shared-bindings/paralleldisplay/ParallelBus.c
3633-
msgid "no reset pin available"
3634-
msgstr ""
3635-
36363598
#: shared-module/sdcardio/SDCard.c
36373599
msgid "no response from SD card"
36383600
msgstr ""

0 commit comments

Comments
 (0)