Skip to content

Commit 1d1ff5f

Browse files
committed
Merge remote-tracking branch 'origin/main' into update-protomatter-rp2
2 parents ff1942c + 5158aec commit 1d1ff5f

File tree

204 files changed

+6154
-1405
lines changed

Some content is hidden

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

204 files changed

+6154
-1405
lines changed

.github/workflows/build.yml

Lines changed: 5 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"
@@ -296,6 +299,7 @@ jobs:
296299
- "pyruler"
297300
- "qtpy_m0"
298301
- "qtpy_m0_haxpress"
302+
- "qtpy_rp2040"
299303
- "raspberry_pi_pico"
300304
- "raytac_mdbt50q-db-40"
301305
- "robohatmm1_m4"
@@ -452,6 +456,7 @@ jobs:
452456
- "targett_module_clip_wrover"
453457
- "unexpectedmaker_feathers2"
454458
- "unexpectedmaker_feathers2_prerelease"
459+
- "unexpectedmaker_tinys2"
455460

456461
steps:
457462
- 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",

docs/design_guide.rst

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,24 @@ use what.
165165
Here is more info on properties from
166166
`Python <https://docs.python.org/3/library/functions.html#property>`_.
167167

168+
Exceptions and asserts
169+
--------------------------------------------------------------------------------
170+
171+
Raise an appropriate `Exception <https://docs.python.org/3/library/exceptions.html#bltin-exceptions>`_,
172+
along with a useful message, whenever a critical test or other condition fails.
173+
174+
Example::
175+
176+
if not 0 <= pin <= 7:
177+
raise ValueError("Pin number must be 0-7.")
178+
179+
If memory is constrained and a more compact method is needed, use `assert`
180+
instead.
181+
182+
Example::
183+
184+
assert 0 <= pin <= 7, "Pin number must be 0-7."
185+
168186
Design for compatibility with CPython
169187
--------------------------------------------------------------------------------
170188

extmod/crypto-algorithms/sha256.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
/*************************** HEADER FILES ***************************/
1616
#include <stdlib.h>
17+
#include <string.h>
1718
#include "sha256.h"
1819

1920
/****************************** MACROS ******************************/

lib/tinyusb

Submodule tinyusb updated 183 files

locale/ID.po

Lines changed: 77 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"
@@ -368,6 +369,7 @@ msgstr "Semua timer untuk pin ini sedang digunakan"
368369
#: ports/esp32s2/common-hal/pulseio/PulseOut.c
369370
#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
370371
#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c
372+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
371373
#: ports/stm/peripherals/timers.c shared-bindings/pwmio/PWMOut.c
372374
msgid "All timers in use"
373375
msgstr "Semua timer sedang digunakan"
@@ -459,6 +461,10 @@ msgstr ""
459461
msgid "Below minimum frame rate"
460462
msgstr "Di bawah frame rate minimum"
461463

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

509+
#: ports/raspberrypi/bindings/rp2pio/StateMachine.c
510+
msgid "Buffer elements must be 4 bytes long or less"
511+
msgstr ""
512+
503513
#: shared-module/usb_hid/Device.c
504514
#, c-format
505515
msgid "Buffer incorrect size. Should be %d bytes."
@@ -1092,6 +1102,10 @@ msgstr ""
10921102
msgid "IV must be %d bytes long"
10931103
msgstr "Panjang IV harus %d byte"
10941104

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

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+
11111133
#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
11121134
msgid "Initialization failed due to lack of memory"
11131135
msgstr ""
11141136

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+
11151142
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
11161143
msgid "Input taking too long"
11171144
msgstr ""
@@ -1467,9 +1494,15 @@ msgstr "Tidak ada DAC (Digital Analog Converter) di dalam chip"
14671494

14681495
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14691496
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1497+
#: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
1498+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
14701499
msgid "No DMA channel found"
14711500
msgstr "tidak ada channel DMA ditemukan"
14721501

1502+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1503+
msgid "No DMA pacing timer found"
1504+
msgstr ""
1505+
14731506
#: shared-module/adafruit_bus_device/I2CDevice.c
14741507
#, c-format
14751508
msgid "No I2C device at address: %x"
@@ -1528,6 +1561,14 @@ msgstr "Tidak ada dukungan perangkat keras pada pin clk"
15281561
msgid "No hardware support on pin"
15291562
msgstr "Tidak ada dukungan hardware untuk pin"
15301563

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+
15311572
#: shared-bindings/aesio/aes.c
15321573
msgid "No key was specified"
15331574
msgstr "Tidak ada kunci yang ditentukan"
@@ -1616,13 +1657,10 @@ msgid "Odd parity is not supported"
16161657
msgstr "Parity ganjil tidak didukung"
16171658

16181659
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
1660+
#: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
16191661
msgid "Only 8 or 16 bit mono with "
16201662
msgstr "Hanya 8 atau 16 bit mono dengan "
16211663

1622-
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
1623-
msgid "Only IN/OUT of up to 8 supported"
1624-
msgstr ""
1625-
16261664
#: ports/esp32s2/common-hal/wifi/__init__.c
16271665
msgid "Only IPv4 addresses supported"
16281666
msgstr ""
@@ -1672,6 +1710,10 @@ msgstr ""
16721710
msgid "Operation timed out"
16731711
msgstr ""
16741712

1713+
#: ports/raspberrypi/bindings/rp2pio/StateMachine.c
1714+
msgid "Out buffer elements must be 4 bytes long or less"
1715+
msgstr ""
1716+
16751717
#: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
16761718
msgid "Out of memory"
16771719
msgstr ""
@@ -1680,6 +1722,11 @@ msgstr ""
16801722
msgid "Out of sockets"
16811723
msgstr ""
16821724

1725+
#: shared-bindings/bitops/__init__.c
1726+
#, c-format
1727+
msgid "Output buffer must be at least %d bytes"
1728+
msgstr ""
1729+
16831730
#: shared-bindings/audiobusio/PDMIn.c
16841731
msgid "Oversample must be multiple of 8."
16851732
msgstr "Sampel berlebihan harus kelipatan 8."
@@ -1756,6 +1803,10 @@ msgstr ""
17561803
"ideal. Jika ini tidak dapat dihindari, berikan allow_inefficient=True ke "
17571804
"konstruktor"
17581805

1806+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1807+
msgid "Pins must share PWM slice"
1808+
msgstr ""
1809+
17591810
#: py/builtinhelp.c
17601811
msgid "Plus any modules on the filesystem\n"
17611812
msgstr "Tambahkan module apapun pada filesystem\n"
@@ -1996,6 +2047,14 @@ msgstr "Memisahkan dengan menggunakan sub-captures"
19962047
msgid "Stack size must be at least 256"
19972048
msgstr "Ukuran stack minimal harus 256"
19982049

2050+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
2051+
msgid "Stereo left must be on PWM channel A"
2052+
msgstr ""
2053+
2054+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
2055+
msgid "Stereo right must be on PWM channel B"
2056+
msgstr ""
2057+
19992058
#: shared-bindings/multiterminal/__init__.c
20002059
msgid "Stream missing readinto() or write() method."
20012060
msgstr "Aliran tidak menemukan metode readinto() atau write()."
@@ -2097,6 +2156,7 @@ msgid "To exit, please reset the board without "
20972156
msgstr "Untuk keluar, silahkan reset board tanpa "
20982157

20992158
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
2159+
#: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
21002160
msgid "Too many channels in sample."
21012161
msgstr "Terlalu banyak channel dalam sampel"
21022162

@@ -2167,6 +2227,8 @@ msgstr "Nilai UUID bukan str, int atau byte buffer"
21672227

21682228
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
21692229
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
2230+
#: ports/raspberrypi/common-hal/audiobusio/I2SOut.c
2231+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
21702232
msgid "Unable to allocate buffers for signed conversion"
21712233
msgstr "Tidak dapat mengalokasikan buffer untuk signed conversion"
21722234

@@ -3359,6 +3421,10 @@ msgstr ""
33593421
msgid "memory allocation failed, heap is locked"
33603422
msgstr ""
33613423

3424+
#: py/objarray.c
3425+
msgid "memoryview: length is not a multiple of itemsize"
3426+
msgstr ""
3427+
33623428
#: py/builtinimport.c
33633429
msgid "module not found"
33643430
msgstr "modul tidak ditemukan"
@@ -3701,6 +3767,7 @@ msgstr ""
37013767
#: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
37023768
#: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
37033769
#: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
3770+
#: ports/esp32s2/boards/unexpectedmaker_tinys2/mpconfigboard.h
37043771
msgid "pressing boot button at start up.\n"
37053772
msgstr ""
37063773

@@ -3778,6 +3845,7 @@ msgid ""
37783845
msgstr ""
37793846

37803847
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
3848+
#: ports/raspberrypi/common-hal/audiobusio/PDMIn.c
37813849
msgid "sampling rate out of range"
37823850
msgstr "nilai sampling keluar dari jangkauan"
37833851

@@ -4135,6 +4203,11 @@ msgstr ""
41354203
msgid "watchdog timeout must be greater than 0"
41364204
msgstr ""
41374205

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

0 commit comments

Comments
 (0)