8000 Merge pull request #4167 from tannewt/rp2040_audiopwmio · alexbartlow/circuitpython@aae10fb · GitHub
[go: up one dir, main page]
Skip to content

Commit aae10fb

Browse files
tannewttannewt
authored
Merge pull request adafruit#4167 from tannewt/rp2040_audiopwmio
Add PWM based audio playback
2 parents e15f157 + 48d4d2b commit aae10fb

35 files changed

+948
-8
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

‎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

‎ports/raspberrypi/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ SRC_C += \
196196
bindings/rp2pio/__init__.c \
197197
common-hal/rp2pio/StateMachine.c \
198198
common-hal/rp2pio/__init__.c \
199+
audio_dma.c \
199200
background.c \
200201
peripherals/pins.c \
201202
fatfs_port.c \

0 commit comments

Comments
 (0)
0