Skip to content

Commit 7867632

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/main' into rp2040_flash
2 parents f200e6a + 2373e64 commit 7867632

File tree

56 files changed

+1147
-880
lines changed

Some content is hidden

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

56 files changed

+1147
-880
lines changed

‎.github/workflows/build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@ jobs:
177177
- "ADM_B_NRF52840_1"
178178
- "TG-Watch"
179179
- "adafruit_feather_rp2040"
180+
- "adafruit_itsybitsy_rp2040"
181+
- "adafruit_qtpy_rp2040"
180182
- "aloriumtech_evo_m51"
181183
- "aramcon_badge_2019"
182184
- "arduino_mkr1300"
@@ -298,10 +300,10 @@ jobs:
298300
- "pyruler"
299301
- "qtpy_m0"
300302
- "qtpy_m0_haxpress"
301-
- "qtpy_rp2040"
302303
- "raspberry_pi_pico"
303304
- "raytac_mdbt50q-db-40"
304305
- "robohatmm1_m4"
306+
- "rotary_trinkey_m0"
305307
- "sam32"
306308
- "same54_xplained"
307309
- "seeeduino_wio_terminal"
@@ -445,6 +447,7 @@ jobs:
445447
board:
446448
- "adafruit_feather_esp32s2_nopsram"
447449
- "adafruit_feather_esp32s2_tftback_nopsram"
450+
- "adafruit_funhouse"
448451
- "adafruit_magtag_2.9_grayscale"
449452
- "adafruit_metro_esp32s2"
450453
- "electroniccats_bastwifi"

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,6 @@ TAGS
8686
####################
8787
.venv
8888
.env
89+
90+
# Uncrustify formatting
91+
*.uncrustify

‎locale/ID.po

Lines changed: 24 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,10 @@ msgstr "Semua perangkat SPI sedang digunakan"
343343
msgid "All UART peripherals are in use"
344344
msgstr "Semua perangkat UART sedang digunakan"
345345

346+
#: shared-bindings/pwmio/PWMOut.c
347+
msgid "All channels in use"
348+
msgstr ""
349+
346350
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
347351
msgid "All event channels in use"
348352
msgstr "Semua channel event sedang digunakan"
@@ -557,6 +561,7 @@ msgstr "Buffer terlalu pendek untuk %d byte"
557561
#: ports/atmel-samd/common-hal/displayio/ParallelBus.c
558562
#: ports/esp32s2/common-hal/displayio/ParallelBus.c
559563
#: ports/nrf/common-hal/displayio/ParallelBus.c
564+
#: ports/raspberrypi/common-hal/displayio/ParallelBus.c
560565
#, c-format
561566
msgid "Bus pin %d is already in use"
562567
msgstr "Pin bus %d sudah digunakan"
@@ -679,7 +684,7 @@ msgstr "Tidak dapat transfer tanpa pin MOSI dan MISO."
679684
msgid "Cannot unambiguously get sizeof scalar"
680685
msgstr "tidak dapat mendapatkan ukuran scalar secara tidak ambigu"
681686

682-
#: ports/stm/common-hal/pwmio/PWMOut.c
687+
#: shared-bindings/pwmio/PWMOut.c
683688
msgid "Cannot vary frequency on a timer that is already in use"
684689
msgstr ""
685690
"Tidak dapat membuat variasi frekuensi pada penghitung waktu yang sudah "
@@ -766,14 +771,6 @@ msgstr ""
766771
msgid "Could not initialize UART"
767772
msgstr "Tidak dapat menginisialisasi UART"
768773

769-
#: ports/esp32s2/common-hal/pwmio/PWMOut.c ports/stm/common-hal/pwmio/PWMOut.c
770-
msgid "Could not initialize channel"
771-
msgstr "Tidak dapat menginisialisasi kanal"
772-
773-
#: ports/esp32s2/common-hal/pwmio/PWMOut.c ports/stm/common-hal/pwmio/PWMOut.c
774-
msgid "Could not initialize timer"
775-
msgstr "Tidak dapat menginisialisasi timer"
776-
777774
#: ports/stm/common-hal/pwmio/PWMOut.c
778775
msgid "Could not re-init channel"
779776
msgstr "Tidak dapat menginisialisasi ulang kanal"
@@ -794,7 +791,7 @@ msgstr ""
794791
msgid "Could not set address"
795792
msgstr ""
796793

797-
#: ports/stm/common-hal/pwmio/PWMOut.c
794+
#: shared-bindings/pwmio/PWMOut.c
798795
msgid "Could not start PWM"
799796
msgstr "Tidak dapat memulai PWM"
800797

@@ -1044,7 +1041,7 @@ msgstr ""
10441041
msgid "Framebuffer requires %d bytes"
10451042
msgstr ""
10461043

1047-
#: ports/stm/common-hal/pwmio/PWMOut.c
1044+
#: shared-bindings/pwmio/PWMOut.c
10481045
msgid "Frequency must match existing PWMOut using this timer"
10491046
msgstr "Frekuensi harus cocok dengan PWMOut yang ada menggunakan timer ini"
10501047

@@ -1274,10 +1271,6 @@ msgstr "Ukuran potongan format tidak valid"
12741271
msgid "Invalid frequency"
12751272
msgstr ""
12761273

1277-
#: ports/stm/common-hal/pwmio/PWMOut.c
1278-
msgid "Invalid frequency supplied"
1279-
msgstr "Frekuensi yang diberikan tidak valid"
1280-
12811274
#: supervisor/shared/safe_mode.c
12821275
msgid "Invalid memory access."
12831276
msgstr "Akses memori tidak valid."
@@ -1323,10 +1316,6 @@ msgstr "Pin untuk channel kanan tidak valid"
13231316
msgid "Invalid pins"
13241317
msgstr "Pin-pin tidak valid"
13251318

1326-
#: ports/stm/common-hal/pwmio/PWMOut.c
1327-
msgid "Invalid pins for PWMOut"
1328-
msgstr "Pin untuk PWMOut tidak valid"
1329-
13301319
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c
13311320
#: shared-bindings/displayio/FourWire.c
13321321
msgid "Invalid polarity"
@@ -1579,18 +1568,6 @@ msgstr "Tidak ada kunci yang ditentukan"
15791568
msgid "No long integer support"
15801569
msgstr "Tidak ada dukungan bilangan bulat yang panjang"
15811570

1582-
#: ports/esp32s2/common-hal/pwmio/PWMOut.c
1583-
msgid "No more channels available"
1584-
msgstr ""
1585-
1586-
#: ports/esp32s2/common-hal/pwmio/PWMOut.c
1587-
msgid "No more timers available"
1588-
msgstr ""
1589-
1590-
#: ports/stm/common-hal/pwmio/PWMOut.c
1591-
msgid "No more timers available on this pin."
1592-
msgstr "Tidak ada lagi penghitung waktu yang tersedia pada pin ini."
1593-
15941571
#: shared-bindings/wifi/Radio.c
15951572
msgid "No network with that ssid"
15961573
msgstr ""
@@ -1758,7 +1735,6 @@ msgid "PWM slice channel A already in use"
17581735
msgstr ""
17591736

17601737
#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c
1761-
#: ports/raspberrypi/common-hal/displayio/ParallelBus.c
17621738
#: ports/stm/common-hal/displayio/ParallelBus.c
17631739
msgid "ParallelBus not yet supported"
17641740
msgstr "ParallelBus belum didukung"
@@ -2164,11 +2140,6 @@ msgstr ""
21642140
msgid "Timeout is too long: Maximum timeout length is %d seconds"
21652141
msgstr ""
21662142

2167-
#: ports/stm/common-hal/pwmio/PWMOut.c
2168-
msgid ""
2169-
"Timer was reserved for internal use - declare PWM pins earlier in the program"
2170-
msgstr ""
2171-
21722143
#: supervisor/shared/safe_mode.c
21732144
msgid "To exit, please reset the board without "
21742145
msgstr "Untuk keluar, silahkan reset board tanpa "
@@ -3789,6 +3760,7 @@ msgstr ""
37893760

37903761
#: ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.h
37913762
#: ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h
3763+
#: ports/esp32s2/boards/adafruit_funhouse/mpconfigboard.h
37923764
#: ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
37933765
#: ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h
37943766
#: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
@@ -4317,6 +4289,21 @@ msgstr ""
43174289
msgid "zi must be of shape (n_section, 2)"
43184290
msgstr ""
43194291

4292+
#~ msgid "Could not initialize channel"
4293+
#~ msgstr "Tidak dapat menginisialisasi kanal"
4294+
4295+
#~ msgid "Could not initialize timer"
4296+
#~ msgstr "Tidak dapat menginisialisasi timer"
4297+
4298+
#~ msgid "Invalid frequency supplied"
4299+
#~ msgstr "Frekuensi yang diberikan tidak valid"
4300+
4301+
#~ msgid "Invalid pins for PWMOut"
4302+
#~ msgstr "Pin untuk PWMOut tidak valid"
4303+
4304+
#~ msgid "No more timers available on this pin."
4305+
#~ msgstr "Tidak ada lagi penghitung waktu yang tersedia pada pin ini."
4306+
43204307
#~ msgid "Group full"
43214308
#~ msgstr "Grup penuh"
43224309

‎locale/circuitpython.pot

Lines changed: 9 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,10 @@ msgstr ""
338338
msgid "All UART peripherals are in use"
339339
msgstr ""
340340

341+
#: shared-bindings/pwmio/PWMOut.c
342+
msgid "All channels in use"
343+
msgstr ""
344+
341345
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
342346
msgid "All event channels in use"
343347
msgstr ""
@@ -550,6 +554,7 @@ msgstr ""
550554
#: ports/atmel-samd/common-hal/displayio/ParallelBus.c
551555
#: ports/esp32s2/common-hal/displayio/ParallelBus.c
552556
#: ports/nrf/common-hal/displayio/ParallelBus.c
557+
#: ports/raspberrypi/common-hal/displayio/ParallelBus.c
553558
#, c-format
554559
msgid "Bus pin %d is already in use"
555560
msgstr ""
@@ -666,7 +671,7 @@ msgstr ""
666671
msgid "Cannot unambiguously get sizeof scalar"
667672
msgstr ""
668673

669-
#: ports/stm/common-hal/pwmio/PWMOut.c
674+
#: shared-bindings/pwmio/PWMOut.c
670675
msgid "Cannot vary frequency on a timer that is already in use"
671676
msgstr ""
672677

@@ -748,14 +753,6 @@ msgstr ""
748753
msgid "Could not initialize UART"
749754
msgstr ""
750755

751-
#: ports/esp32s2/common-hal/pwmio/PWMOut.c ports/stm/common-hal/pwmio/PWMOut.c
752-
msgid "Could not initialize channel"
753-
msgstr ""
754-
755-
#: ports/esp32s2/common-hal/pwmio/PWMOut.c ports/stm/common-hal/pwmio/PWMOut.c
756-
msgid "Could not initialize timer"
757-
msgstr ""
758-
759756
#: ports/stm/common-hal/pwmio/PWMOut.c
760757
msgid "Could not re-init channel"
761758
msgstr ""
@@ -776,7 +773,7 @@ msgstr ""
776773
msgid "Could not set address"
777774
msgstr ""
778775

779-
#: ports/stm/common-hal/pwmio/PWMOut.c
776+
#: shared-bindings/pwmio/PWMOut.c
780777
msgid "Could not start PWM"
781778
msgstr ""
782779

@@ -1025,7 +1022,7 @@ msgstr ""
10251022
msgid "Framebuffer requires %d bytes"
10261023
msgstr ""
10271024

1028-
#: ports/stm/common-hal/pwmio/PWMOut.c
1025+
#: shared-bindings/pwmio/PWMOut.c
10291026
msgid "Frequency must match existing PWMOut using this timer"
10301027
msgstr ""
10311028

@@ -1253,10 +1250,6 @@ msgstr ""
12531250
msgid "Invalid frequency"
12541251
msgstr ""
12551252

1256-
#: ports/stm/common-hal/pwmio/PWMOut.c
1257-
msgid "Invalid frequency supplied"
1258-
msgstr ""
1259-
12601253
#: supervisor/shared/safe_mode.c
12611254
msgid "Invalid memory access."
12621255
msgstr ""
@@ -1302,10 +1295,6 @@ msgstr ""
13021295
msgid "Invalid pins"
13031296
msgstr ""
13041297

1305-
#: ports/stm/common-hal/pwmio/PWMOut.c
1306-
msgid "Invalid pins for PWMOut"
1307-
msgstr ""
1308-
13091298
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c
13101299
#: shared-bindings/displayio/FourWire.c
13111300
msgid "Invalid polarity"
@@ -1558,18 +1547,6 @@ msgstr ""
15581547
msgid "No long integer support"
15591548
msgstr ""
15601549

1561-
#: ports/esp32s2/common-hal/pwmio/PWMOut.c
1562-
msgid "No more channels available"
1563-
msgstr ""
1564-
1565-
#: ports/esp32s2/common-hal/pwmio/PWMOut.c
1566-
msgid "No more timers available"
1567-
msgstr ""
1568-
1569-
#: ports/stm/common-hal/pwmio/PWMOut.c
1570-
msgid "No more timers available on this pin."
1571-
msgstr ""
1572-
15731550
#: shared-bindings/wifi/Radio.c
15741551
msgid "No network with that ssid"
15751552
msgstr ""
@@ -1729,7 +1706,6 @@ msgid "PWM slice channel A already in use"
17291706
msgstr ""
17301707

17311708
#: ports/mimxrt10xx/common-hal/displayio/ParallelBus.c
1732-
#: ports/raspberrypi/common-hal/displayio/ParallelBus.c
17331709
#: ports/stm/common-hal/displayio/ParallelBus.c
17341710
msgid "ParallelBus not yet supported"
17351711
msgstr ""
@@ -2124,11 +2100,6 @@ msgstr ""
21242100
msgid "Timeout is too long: Maximum timeout length is %d seconds"
21252101
msgstr ""
21262102

2127-
#: ports/stm/common-hal/pwmio/PWMOut.c
2128-
msgid ""
2129-
"Timer was reserved for internal use - declare PWM pins earlier in the program"
2130-
msgstr ""
2131-
21322103
#: supervisor/shared/safe_mode.c
21332104
msgid "To exit, please reset the board without "
21342105
msgstr ""
@@ -3737,6 +3708,7 @@ msgstr ""
37373708

37383709
#: ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.h
37393710
#: ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h
3711+
#: ports/esp32s2/boards/adafruit_funhouse/mpconfigboard.h
37403712
#: ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
37413713
#: ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h
37423714
#: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h

0 commit comments

Comments
 (0)