Skip to content

Commit 3f08cb4

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/main' into busio-uart-rp
2 parents 52bc935 + b69cb01 commit 3f08cb4

184 files changed

Lines changed: 5094 additions & 1318 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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,9 @@ jobs:
281281
- "pewpew10"
282282
- "pewpew_m4"
283283
- "picoplanet"
284+
- "pimoroni_keybow2040"
285+
- "pimoroni_picosystem"
286+
- "pimoroni_tiny2040"
284287
- "pirkey_m0"
285288
- "pitaya_go"
286289
- "pyb_nano_v2"
@@ -453,6 +456,7 @@ jobs:
453456
- "targett_module_clip_wrover"
454457
- "unexpectedmaker_feathers2"
455458
- "unexpectedmaker_feathers2_prerelease"
459+
- "unexpectedmaker_tinys2"
456460

457461
steps:
458462
- name: Set up Python 3.8

‎conf.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@
178178
"ports/cxd56/spresense-exported-sdk",
179179
"ports/esp32s2/certificates",
180180
"ports/esp32s2/esp-idf",
181+
"ports/esp32s2/.idf_tools",
181182
"ports/esp32s2/peripherals",
182183
"ports/litex/hw",
183184
"ports/minimal",

‎extmod/ulab‎

‎frozen/Adafruit_CircuitPython_FocalTouch‎

‎frozen/Adafruit_CircuitPython_Register‎

Submodule Adafruit_CircuitPython_Register updated 30 files

‎lib/tinyusb‎

Submodule tinyusb updated 183 files

‎locale/ID.po‎

Lines changed: 58 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ msgstr "%q harus >= 1"
107107
msgid "%q must be a tuple of length 2"
108108
msgstr "%q harus berupa tuple dengan panjang 2"
109109

110+
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
110111
#: shared-bindings/canio/Match.c
111112
msgid "%q out of range"
112113
msgstr "%q di luar jangkauan"
@@ -460,6 +461,10 @@ msgstr ""
460461
msgid "Below minimum frame rate"
461462
msgstr "Di bawah frame rate minimum"
462463

464+
#: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
465+
msgid "Bit clock and word select must be sequential pins"
466+
msgstr ""
467+
463468
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
464469
msgid "Bit clock and word select must share a clock unit"
465470
msgstr "Bit clock dan word harus memiliki kesamaan pada clock unit"
@@ -501,6 +506,10 @@ msgstr "Brightness tidak bisa disesuaikan"
501506
msgid "Buffer + offset too small %d %d %d"
502507
msgstr "Buffer + offset terlalu kecil %d %d %d"
503508

509+
#: ports/raspberrypi/bindings/rp2pio/StateMachine.c
510+
msgid "Buffer elements must be 4 bytes long or less"
511+
msgstr ""
512+
504513
#: shared-module/usb_hid/Device.c
505514
#, c-format
506515
msgid "Buffer incorrect size. Should be %d bytes."
@@ -1093,6 +1102,10 @@ msgstr ""
10931102
msgid "IV must be %d bytes long"
10941103
msgstr "Panjang IV harus %d byte"
10951104

1105+
#: ports/raspberrypi/bindings/rp2pio/StateMachine.c
1106+
msgid "In buffer elements must be 4 bytes long or less"
1107+
msgstr ""
1108+
10961109
#: py/persistentcode.c
10971110
msgid ""
10981111
"Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/"
@@ -1109,10 +1122,23 @@ msgstr "Ukuran penyangga salah"
11091122
msgid "Init program size invalid"
11101123
msgstr ""
11111124

1125+
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
1126+
msgid "Initial set pin direcion conflicts with initial out pin direction"
1127+
msgstr ""
1128+
1129+
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
1130+
msgid "Initial set pin state conflicts with initial out pin state"
1131+
msgstr ""
1132+
11121133
#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
11131134
msgid "Initialization failed due to lack of memory"
11141135
msgstr ""
11151136

1137+
#: shared-bindings/bitops/__init__.c
1138+
#, c-format
1139+
msgid "Input buffer length (%d) must be a multiple of the strand count (%d)"
1140+
msgstr ""
1141+
11161142
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
11171143
msgid "Input taking too long"
11181144
msgstr ""
@@ -1468,6 +1494,7 @@ msgstr "Tidak ada DAC (Digital Analog Converter) di dalam chip"
14681494

14691495
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14701496
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1497+
#: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
14711498
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
14721499
msgid "No DMA channel found"
14731500
msgstr "tidak ada channel DMA ditemukan"
@@ -1534,6 +1561,14 @@ msgstr "Tidak ada dukungan perangkat keras pada pin clk"
15341561
msgid "No hardware support on pin"
15351562
msgstr "Tidak ada dukungan hardware untuk pin"
15361563

1564+
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
1565+
msgid "No in in program"
1566+
msgstr ""
1567+
1568+
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
1569+
msgid "No in or out in program"
1570+
msgstr ""
1571+
15371572
#: shared-bindings/aesio/aes.c
15381573
msgid "No key was specified"
15391574
msgstr "Tidak ada kunci yang ditentukan"
@@ -1622,13 +1657,10 @@ msgid "Odd parity is not supported"
16221657
msgstr "Parity ganjil tidak didukung"
16231658

16241659
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
1660+
#: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
16251661
msgid "Only 8 or 16 bit mono with "
16261662
msgstr "Hanya 8 atau 16 bit mono dengan "
16271663

1628-
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
1629-
msgid "Only IN/OUT of up to 8 supported"
1630-
msgstr ""
1631-
16321664
#: ports/esp32s2/common-hal/wifi/__init__.c
16331665
msgid "Only IPv4 addresses supported"
16341666
msgstr ""
@@ -1678,6 +1710,10 @@ msgstr ""
16781710
msgid "Operation timed out"
16791711
msgstr ""
16801712

1713+
#: ports/raspberrypi/bindings/rp2pio/StateMachine.c
1714+
msgid "Out buffer elements must be 4 bytes long or less"
1715+
msgstr ""
1716+
16811717
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
16821718
msgid "Out of memory"
16831719
msgstr ""
@@ -1686,6 +1722,11 @@ msgstr ""
16861722
msgid "Out of sockets"
16871723
msgstr ""
16881724

1725+
#: shared-bindings/bitops/__init__.c
1726+
#, c-format
1727+
msgid "Output buffer must be at least %d bytes"
1728+
msgstr ""
1729+
16891730
#: shared-bindings/audiobusio/PDMIn.c
16901731
msgid "Oversample must be multiple of 8."
16911732
msgstr "Sampel berlebihan harus kelipatan 8."
@@ -2115,6 +2156,7 @@ msgid "To exit, please reset the board without "
21152156
msgstr "Untuk keluar, silahkan reset board tanpa "
21162157

21172158
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
2159+
#: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
21182160
msgid "Too many channels in sample."
21192161
msgstr "Terlalu banyak channel dalam sampel"
21202162

@@ -2185,6 +2227,7 @@ msgstr "Nilai UUID bukan str, int atau byte buffer"
21852227

21862228
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
21872229
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
2230+
#: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
21882231
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
21892232
msgid "Unable to allocate buffers for signed conversion"
21902233
msgstr "Tidak dapat mengalokasikan buffer untuk signed conversion"
@@ -3378,6 +3421,10 @@ msgstr ""
33783421
msgid "memory allocation failed, heap is locked"
33793422
msgstr ""
33803423

3424+
#: py/objarray.c
3425+
msgid "memoryview: length is not a multiple of itemsize"
3426+
msgstr ""
3427+
33813428
#: py/builtinimport.c
33823429
msgid "module not found"
33833430
msgstr "modul tidak ditemukan"
@@ -3720,6 +3767,7 @@ msgstr ""
37203767
#: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
37213768
#: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
37223769
#: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
3770+
#: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h
37233771
msgid "pressing boot button at start up.\n"
37243772
msgstr ""
37253773

@@ -3797,6 +3845,7 @@ msgid ""
37973845
msgstr ""
37983846

37993847
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
3848+
#: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
38003849
msgid "sampling rate out of range"
38013850
msgstr "nilai sampling keluar dari jangkauan"
38023851

@@ -4154,6 +4203,11 @@ msgstr ""
41544203
msgid "watchdog timeout must be greater than 0"
41554204
msgstr ""
41564205

4206+
#: shared-bindings/bitops/__init__.c
4207+
#, c-format
4208+
msgid "width must be from 2 to 8 (inclusive), not %d"
4209+
msgstr ""
4210+
41574211
#: shared-bindings/rgbmatrix/RGBMatrix.c
41584212
msgid "width must be greater than zero"
41594213
msgstr ""

‎locale/circuitpython.pot‎

Lines changed: 43 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ msgstr ""
102102
msgid "%q must be a tuple of length 2"
103103
msgstr ""
104104

105+
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
105106
#: shared-bindings/canio/Match.c
106107
msgid "%q out of range"
107108
msgstr ""
@@ -454,6 +455,10 @@ msgstr ""
454455
msgid "Below minimum frame rate"
455456
msgstr ""
456457

458+
#: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
459+
msgid "Bit clock and word select must be sequential pins"
460+
msgstr ""
461+
457462
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
458463
msgid "Bit clock and word select must share a clock unit"
459464
msgstr ""
@@ -495,6 +500,10 @@ msgstr ""
495500
msgid "Buffer + offset too small %d %d %d"
496501
msgstr ""
497502

503+
#: ports/raspberrypi/bindings/rp2pio/StateMachine.c
504+
msgid "Buffer elements must be 4 bytes long or less"
505+
msgstr ""
506+
498507
#: shared-module/usb_hid/Device.c
499508
#, c-format
500509
msgid "Buffer incorrect size. Should be %d bytes."
@@ -1076,6 +1085,10 @@ msgstr ""
10761085
msgid "IV must be %d bytes long"
10771086
msgstr ""
10781087

1088+
#: ports/raspberrypi/bindings/rp2pio/StateMachine.c
1089+
msgid "In buffer elements must be 4 bytes long or less"
1090+
msgstr ""
1091+
10791092
#: py/persistentcode.c
10801093
msgid ""
10811094
"Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/"
@@ -1090,6 +1103,14 @@ msgstr ""
10901103
msgid "Init program size invalid"
10911104
msgstr ""
10921105

1106+
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
1107+
msgid "Initial set pin direcion conflicts with initial out pin direction"
1108+
msgstr ""
1109+
1110+
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
1111+
msgid "Initial set pin state conflicts with initial out pin state"
1112+
msgstr ""
1113+
10931114
#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
10941115
msgid "Initialization failed due to lack of memory"
10951116
msgstr ""
@@ -1456,6 +1477,7 @@ msgstr ""
14561477

14571478
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14581479
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1480+
#: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
14591481
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
14601482
msgid "No DMA channel found"
14611483
msgstr ""
@@ -1522,6 +1544,14 @@ msgstr ""
15221544
msgid "No hardware support on pin"
15231545
msgstr ""
15241546

1547+
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
1548+
msgid "No in in program"
1549+
msgstr ""
1550+
1551+
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
1552+
msgid "No in or out in program"
1553+
msgstr ""
1554+
15251555
#: shared-bindings/aesio/aes.c
15261556
msgid "No key was specified"
15271557
msgstr ""
@@ -1608,13 +1638,10 @@ msgid "Odd parity is not supported"
16081638
msgstr ""
16091639

16101640
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
1641+
#: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
16111642
msgid "Only 8 or 16 bit mono with "
16121643
msgstr ""
16131644

1614-
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
1615-
msgid "Only IN/OUT of up to 8 supported"
1616-
msgstr ""
1617-
16181645
#: ports/esp32s2/common-hal/wifi/__init__.c
16191646
msgid "Only IPv4 addresses supported"
16201647
msgstr ""
@@ -1660,6 +1687,10 @@ msgstr ""
16601687
msgid "Operation timed out"
16611688
msgstr ""
16621689

1690+
#: ports/raspberrypi/bindings/rp2pio/StateMachine.c
1691+
msgid "Out buffer elements must be 4 bytes long or less"
1692+
msgstr ""
1693+
16631694
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
16641695
msgid "Out of memory"
16651696
msgstr ""
@@ -2089,6 +2120,7 @@ msgid "To exit, please reset the board without "
20892120
msgstr ""
20902121

20912122
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
2123+
#: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
20922124
msgid "Too many channels in sample."
20932125
msgstr ""
20942126

@@ -2154,6 +2186,7 @@ msgstr ""
21542186

21552187
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
21562188
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
2189+
#: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
21572190
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
21582191
msgid "Unable to allocate buffers for signed conversion"
21592192
msgstr ""
@@ -3337,6 +3370,10 @@ msgstr ""
33373370
msgid "memory allocation failed, heap is locked"
33383371
msgstr ""
33393372

3373+
#: py/objarray.c
3374+
msgid "memoryview: length is not a multiple of itemsize"
3375+
msgstr ""
3376+
33403377
#: py/builtinimport.c
33413378
msgid "module not found"
33423379
msgstr ""
@@ -3678,6 +3715,7 @@ msgstr ""
36783715
#: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
36793716
#: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
36803717
#: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
3718+
#: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h
36813719
msgid "pressing boot button at start up.\n"
36823720
msgstr ""
36833721

@@ -3755,6 +3793,7 @@ msgid ""
37553793
msgstr ""
37563794

37573795
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
3796+
#: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
37583797
msgid "sampling rate out of range"
37593798
msgstr ""
37603799

0 commit comments

Comments
 (0)