Skip to content

Commit 93d7885

Browse files
dhalbertdhalbert
committed
Merge remote-tracking branch 'adafruit/main' into secondary-cdc
2 parents d54b586 + 5ccbb0b commit 93d7885

File tree

63 files changed

+1395
-40
lines changed

Some content is hidden

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

63 files changed

+1395
-40
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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ jobs:
296296
- "pyruler"
297297
- "qtpy_m0"
298298
- "qtpy_m0_haxpress"
299+
- "qtpy_rp2040"
299300
- "raspberry_pi_pico"
300301
- "raytac_mdbt50q-db-40"
301302
- "robohatmm1_m4"

‎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

‎frozen/pew-pewpew-standalone-10.x‎

‎locale/ID.po‎

Lines changed: 19 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"
@@ -1467,9 +1468,14 @@ msgstr "Tidak ada DAC (Digital Analog Converter) di dalam chip"
14671468

14681469
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14691470
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1471+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
14701472
msgid "No DMA channel found"
14711473
msgstr "tidak ada channel DMA ditemukan"
14721474

1475+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1476+
msgid "No DMA pacing timer found"
1477+
msgstr ""
1478+
14731479
#: shared-module/adafruit_bus_device/I2CDevice.c
14741480
#, c-format
14751481
msgid "No I2C device at address: %x"
@@ -1756,6 +1762,10 @@ msgstr ""
17561762
"ideal. Jika ini tidak dapat dihindari, berikan allow_inefficient=True ke "
17571763
"konstruktor"
17581764

1765+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1766+
msgid "Pins must share PWM slice"
1767+
msgstr ""
1768+
17591769
#: py/builtinhelp.c
17601770
msgid "Plus any modules on the filesystem\n"
17611771
msgstr "Tambahkan module apapun pada filesystem\n"
@@ -1996,6 +2006,14 @@ msgstr "Memisahkan dengan menggunakan sub-captures"
19962006
msgid "Stack size must be at least 256"
19972007
msgstr "Ukuran stack minimal harus 256"
19982008

2009+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
2010+
msgid "Stereo left must be on PWM channel A"
2011+
msgstr ""
2012+
2013+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
2014+
msgid "Stereo right must be on PWM channel B"
2015+
msgstr ""
2016+
19992017
#: shared-bindings/multiterminal/__init__.c
20002018
msgid "Stream missing readinto() or write() method."
20012019
msgstr "Aliran tidak menemukan metode readinto() atau write()."
@@ -2167,6 +2185,7 @@ msgstr "Nilai UUID bukan str, int atau byte buffer"
21672185

21682186
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
21692187
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
2188+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
21702189
msgid "Unable to allocate buffers for signed conversion"
21712190
msgstr "Tidak dapat mengalokasikan buffer untuk signed conversion"
21722191

‎locale/circuitpython.pot‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ msgstr ""
363363
#: ports/esp32s2/common-hal/pulseio/PulseOut.c
364364
#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
365365
#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c
366+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
366367
#: ports/stm/peripherals/timers.c shared-bindings/pwmio/PWMOut.c
367368
msgid "All timers in use"
368369
msgstr ""
@@ -1446,9 +1447,14 @@ msgstr ""
14461447

14471448
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14481449
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1450+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
14491451
msgid "No DMA channel found"
14501452
msgstr ""
14511453

1454+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1455+
msgid "No DMA pacing timer found"
1456+
msgstr ""
1457+
14521458
#: shared-module/adafruit_bus_device/I2CDevice.c
14531459
#, c-format
14541460
msgid "No I2C device at address: %x"
@@ -1724,6 +1730,10 @@ msgid ""
17241730
"constructor"
17251731
msgstr ""
17261732

1733+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1734+
msgid "Pins must share PWM slice"
1735+
msgstr ""
1736+
17271737
#: py/builtinhelp.c
17281738
msgid "Plus any modules on the filesystem\n"
17291739
msgstr ""
@@ -1963,6 +1973,14 @@ msgstr ""
19631973
msgid "Stack size must be at least 256"
19641974
msgstr ""
19651975

1976+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1977+
msgid "Stereo left must be on PWM channel A"
1978+
msgstr ""
1979+
1980+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1981+
msgid "Stereo right must be on PWM channel B"
1982+
msgstr ""
1983+
19661984
#: shared-bindings/multiterminal/__init__.c
19671985
msgid "Stream missing readinto() or write() method."
19681986
msgstr ""
@@ -2126,6 +2144,7 @@ msgstr ""
21262144

21272145
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
21282146
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
2147+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
21292148
msgid "Unable to allocate buffers for signed conversion"
21302149
msgstr ""
21312150

‎locale/cs.po‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,7 @@ msgstr ""
366366
#: ports/esp32s2/common-hal/pulseio/PulseOut.c
367367
#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
368368
#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c
369+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
369370
#: ports/stm/peripherals/timers.c shared-bindings/pwmio/PWMOut.c
370371
msgid "All timers in use"
371372
msgstr ""
@@ -1449,9 +1450,14 @@ msgstr ""
14491450

14501451
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14511452
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1453+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
14521454
msgid "No DMA channel found"
14531455
msgstr ""
14541456

1457+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1458+
msgid "No DMA pacing timer found"
1459+
msgstr ""
1460+
14551461
#: shared-module/adafruit_bus_device/I2CDevice.c
14561462
#, c-format
14571463
msgid "No I2C device at address: %x"
@@ -1727,6 +1733,10 @@ msgid ""
17271733
"constructor"
17281734
msgstr ""
17291735

1736+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1737+
msgid "Pins must share PWM slice"
1738+
msgstr ""
1739+
17301740
#: py/builtinhelp.c
17311741
msgid "Plus any modules on the filesystem\n"
17321742
msgstr ""
@@ -1966,6 +1976,14 @@ msgstr ""
19661976
msgid "Stack size must be at least 256"
19671977
msgstr ""
19681978

1979+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1980+
msgid "Stereo left must be on PWM channel A"
1981+
msgstr ""
1982+
1983+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1984+
msgid "Stereo right must be on PWM channel B"
1985+
msgstr ""
1986+
19691987
#: shared-bindings/multiterminal/__init__.c
19701988
msgid "Stream missing readinto() or write() method."
19711989
msgstr ""
@@ -2129,6 +2147,7 @@ msgstr ""
21292147

21302148
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
21312149
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
2150+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
21322151
msgid "Unable to allocate buffers for signed conversion"
21332152
msgstr ""
21342153

‎locale/de_DE.po‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ msgstr "Alle timer für diesen Pin werden bereits benutzt"
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 "Alle timer werden benutzt"
@@ -1469,9 +1470,14 @@ msgstr "Kein DAC im Chip vorhanden"
14691470

14701471
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14711472
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1473+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
14721474
msgid "No DMA channel found"
14731475
msgstr "Kein DMA Kanal gefunden"
14741476

1477+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1478+
msgid "No DMA pacing timer found"
1479+
msgstr ""
1480+
14751481
#: shared-module/adafruit_bus_device/I2CDevice.c
14761482
#, c-format
14771483
msgid "No I2C device at address: %x"
@@ -1756,6 +1762,10 @@ msgstr ""
17561762
"Bytes verbraucht. Wenn dies nicht vermieden werden kann, übergeben Sie "
17571763
"allow_inefficient = True an den Konstruktor"
17581764

1765+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1766+
msgid "Pins must share PWM slice"
1767+
msgstr ""
1768+
17591769
#: py/builtinhelp.c
17601770
msgid "Plus any modules on the filesystem\n"
17611771
msgstr "und alle Module im Dateisystem \n"
@@ -1995,6 +2005,14 @@ msgstr "Splitting mit sub-captures"
19952005
msgid "Stack size must be at least 256"
19962006
msgstr "Die Stackgröße sollte mindestens 256 sein"
19972007

2008+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
2009+
msgid "Stereo left must be on PWM channel A"
2010+
msgstr ""
2011+
2012+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
2013+
msgid "Stereo right must be on PWM channel B"
2014+
msgstr ""
2015+
19982016
#: shared-bindings/multiterminal/__init__.c
19992017
msgid "Stream missing readinto() or write() method."
20002018
msgstr "Stream fehlt readinto() oder write() Methode."
@@ -2172,6 +2190,7 @@ msgstr "Der UUID-Wert ist kein str-, int- oder Byte-Puffer"
21722190

21732191
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
21742192
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
2193+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
21752194
msgid "Unable to allocate buffers for signed conversion"
21762195
msgstr "Konnte keine Buffer für Vorzeichenumwandlung allozieren"
21772196

‎locale/el.po‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ msgstr ""
363363
#: ports/esp32s2/common-hal/pulseio/PulseOut.c
364364
#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
365365
#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c
366+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
366367
#: ports/stm/peripherals/timers.c shared-bindings/pwmio/PWMOut.c
367368
msgid "All timers in use"
368369
msgstr ""
@@ -1446,9 +1447,14 @@ msgstr ""
14461447

14471448
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14481449
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1450+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
14491451
msgid "No DMA channel found"
14501452
msgstr ""
14511453

1454+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1455+
msgid "No DMA pacing timer found"
1456+
msgstr ""
1457+
14521458
#: shared-module/adafruit_bus_device/I2CDevice.c
14531459
#, c-format
14541460
msgid "No I2C device at address: %x"
@@ -1724,6 +1730,10 @@ msgid ""
17241730
"constructor"
17251731
msgstr ""
17261732

1733+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1734+
msgid "Pins must share PWM slice"
1735+
msgstr ""
1736+
17271737
#: py/builtinhelp.c
17281738
msgid "Plus any modules on the filesystem\n"
17291739
msgstr ""
@@ -1963,6 +1973,14 @@ msgstr ""
19631973
msgid "Stack size must be at least 256"
19641974
msgstr ""
19651975

1976+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1977+
msgid "Stereo left must be on PWM channel A"
1978+
msgstr ""
1979+
1980+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1981+
msgid "Stereo right must be on PWM channel B"
1982+
msgstr ""
1983+
19661984
#: shared-bindings/multiterminal/__init__.c
19671985
msgid "Stream missing readinto() or write() method."
19681986
msgstr ""
@@ -2126,6 +2144,7 @@ msgstr ""
21262144

21272145
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
21282146
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
2147+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
21292148
msgid "Unable to allocate buffers for signed conversion"
21302149
msgstr ""
21312150

‎locale/es.po‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,7 @@ msgstr "Todos los timers para este pin están siendo utilizados"
374374
#: ports/esp32s2/common-hal/pulseio/PulseOut.c
375375
#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
376376
#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c
377+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
377378
#: ports/stm/peripherals/timers.c shared-bindings/pwmio/PWMOut.c
378379
msgid "All timers in use"
379380
msgstr "Todos los timers en uso"
@@ -1470,9 +1471,14 @@ msgstr "El chip no tiene DAC"
14701471

14711472
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14721473
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
1474+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
14731475
msgid "No DMA channel found"
14741476
msgstr "No se encontró el canal DMA"
14751477

1478+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1479+
msgid "No DMA pacing timer found"
1480+
msgstr ""
1481+
14761482
#: shared-module/adafruit_bus_device/I2CDevice.c
14771483
#, c-format
14781484
msgid "No I2C device at address: %x"
@@ -1759,6 +1765,10 @@ msgstr ""
17591765
"ideales. Si esto no se puede evitar, pase allow_inefficient=True al "
17601766
"constructor"
17611767

1768+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
1769+
msgid "Pins must share PWM slice"
1770+
msgstr ""
1771+
17621772
#: py/builtinhelp.c
17631773
msgid "Plus any modules on the filesystem\n"
17641774
msgstr "Además de cualquier módulo en el sistema de archivos\n"
@@ -2002,6 +2012,14 @@ msgstr "Dividiendo con sub-capturas"
20022012
msgid "Stack size must be at least 256"
20032013
msgstr "El tamaño de la pila debe ser de al menos 256"
20042014

2015+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
2016+
msgid "Stereo left must be on PWM channel A"
2017+
msgstr ""
2018+
2019+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
2020+
msgid "Stereo right must be on PWM channel B"
2021+
msgstr ""
2022+
20052023
#: shared-bindings/multiterminal/__init__.c
20062024
msgid "Stream missing readinto() or write() method."
20072025
msgstr "A Stream le falta el método readinto() o write()."
@@ -2179,6 +2197,7 @@ msgstr "UUID valor no es un str, int o byte buffer"
21792197

21802198
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
21812199
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
2200+
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
21822201
msgid "Unable to allocate buffers for signed conversion"
21832202
msgstr "No se pudieron asignar buffers para la conversión con signo"
21842203

0 commit comments

Comments
 (0)