Skip to content

Commit eeb89a9

Browse files
authored
Merge pull request #41 from adafruit/main
Update from adafruit main
2 parents cec921f + e41137c commit eeb89a9

File tree

213 files changed

+5725
-1167
lines changed

Some content is hidden

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

213 files changed

+5725
-1167
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*.deb binary
1919
*.zip binary
2020
*.pdf binary
21+
*.wav binary
2122

2223
# These should also not be modified by git.
2324
tests/basics/string_cr_conversion.py -text

.github/workflows/build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ jobs:
208208
- "datum_imu"
209209
- "datum_light"
210210
- "datum_weather"
211+
- "dynalora_usb"
211212
- "dynossat_edu_eps"
212213
- "dynossat_edu_obc"
213214
- "electronut_labs_blip"
@@ -280,6 +281,9 @@ jobs:
280281
- "pewpew10"
281282
- "pewpew_m4"
282283
- "picoplanet"
284+
- "pimoroni_keybow2040"
285+
- "pimoroni_picosystem"
286+
- "pimoroni_tiny2040"
283287
- "pirkey_m0"
284288
- "pitaya_go"
285289
- "pyb_nano_v2"
@@ -295,6 +299,7 @@ jobs:
295299
- "pyruler"
296300
- "qtpy_m0"
297301
- "qtpy_m0_haxpress"
302+
- "qtpy_rp2040"
298303
- "raspberry_pi_pico"
299304
- "raytac_mdbt50q-db-40"
300305
- "robohatmm1_m4"
@@ -451,6 +456,7 @@ jobs:
451456
- "targett_module_clip_wrover"
452457
- "unexpectedmaker_feathers2"
453458
- "unexpectedmaker_feathers2_prerelease"
459+
- "unexpectedmaker_tinys2"
454460

455461
steps:
456462
- 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 ******************************/

locale/ID.po

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ msgstr "Semua timer untuk pin ini sedang digunakan"
368368
#: ports/esp32s2/common-hal/pulseio/PulseOut.c
369369
#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
370370
#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c
371+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
371372
#: ports/stm/peripherals/timers.c shared-bindings/pwmio/PWMOut.c
372373
msgid "All timers in use"
373374
msgstr "Semua timer sedang digunakan"
@@ -1112,6 +1113,11 @@ msgstr ""
11121113
msgid "Initialization failed due to lack of memory"
11131114
msgstr ""
11141115

1116+
#: shared-bindings/bitops/__init__.c
1117+
#, c-format
1118+
msgid "Input buffer length (%d) must be a multiple of the strand count (%d)"
1119+
msgstr ""
1120+
11151121
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
11161122
msgid "Input taking too long"
11171123
msgstr ""
@@ -1467,9 +1473,14 @@ msgstr "Tidak ada DAC (Digital Analog Converter) di dalam chip"
14671473

14681474
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14691475
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1476+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
14701477
msgid "No DMA channel found"
14711478
msgstr "tidak ada channel DMA ditemukan"
14721479

1480+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1481+
msgid "No DMA pacing timer found"
1482+
msgstr ""
1483+
14731484
#: shared-module/adafruit_bus_device/I2CDevice.c
14741485
#, c-format
14751486
msgid "No I2C device at address: %x"
@@ -1680,6 +1691,11 @@ msgstr ""
16801691
msgid "Out of sockets"
16811692
msgstr ""
16821693

1694+
#: shared-bindings/bitops/__init__.c
1695+
#, c-format
1696+
msgid "Output buffer must be at least %d bytes"
1697+
msgstr ""
1698+
16831699
#: shared-bindings/audiobusio/PDMIn.c
16841700
msgid "Oversample must be multiple of 8."
16851701
msgstr "Sampel berlebihan harus kelipatan 8."
@@ -1756,6 +1772,10 @@ msgstr ""
17561772
"ideal. Jika ini tidak dapat dihindari, berikan allow_inefficient=True ke "
17571773
"konstruktor"
17581774

1775+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1776+
msgid "Pins must share PWM slice"
1777+
msgstr ""
1778+
17591779
#: py/builtinhelp.c
17601780
msgid "Plus any modules on the filesystem\n"
17611781
msgstr "Tambahkan module apapun pada filesystem\n"
@@ -1996,6 +2016,14 @@ msgstr "Memisahkan dengan menggunakan sub-captures"
19962016
msgid "Stack size must be at least 256"
19972017
msgstr "Ukuran stack minimal harus 256"
19982018

2019+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
2020+
msgid "Stereo left must be on PWM channel A"
2021+
msgstr ""
2022+
2023+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
2024+
msgid "Stereo right must be on PWM channel B"
2025+
msgstr ""
2026+
19992027
#: shared-bindings/multiterminal/__init__.c
20002028
msgid "Stream missing readinto() or write() method."
20012029
msgstr "Aliran tidak menemukan metode readinto() atau write()."
@@ -2167,6 +2195,7 @@ msgstr "Nilai UUID bukan str, int atau byte buffer"
21672195

21682196
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
21692197
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
2198+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
21702199
msgid "Unable to allocate buffers for signed conversion"
21712200
msgstr "Tidak dapat mengalokasikan buffer untuk signed conversion"
21722201

@@ -3359,6 +3388,10 @@ msgstr ""
33593388
msgid "memory allocation failed, heap is locked"
33603389
msgstr ""
33613390

3391+
#: py/objarray.c
3392+
msgid "memoryview: length is not a multiple of itemsize"
3393+
msgstr ""
3394+
33623395
#: py/builtinimport.c
33633396
msgid "module not found"
33643397
msgstr "modul tidak ditemukan"
@@ -3674,6 +3707,10 @@ msgstr "Muncul dari PulseIn yang kosong"
36743707
msgid "pop from empty %q"
36753708
msgstr ""
36763709

3710+
#: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
3711+
msgid "port must be >= 0"
3712+
msgstr ""
3713+
36773714
#: py/objint_mpz.c
36783715
msgid "pow() 3rd argument cannot be 0"
36793716
msgstr ""
@@ -4131,6 +4168,11 @@ msgstr ""
41314168
msgid "watchdog timeout must be greater than 0"
41324169
msgstr ""
41334170

4171+
#: shared-bindings/bitops/__init__.c
4172+
#, c-format
4173+
msgid "width must be from 2 to 8 (inclusive), not %d"
4174+
msgstr ""
4175+
41344176
#: shared-bindings/rgbmatrix/RGBMatrix.c
41354177
msgid "width must be greater than zero"
41364178
msgstr ""

0 commit comments

Comments
 (0)