Skip to content

Commit

Permalink
Merge pull request #4167 from tannewt/rp2040_audiopwmio
Browse files Browse the repository at this point in the history
Add PWM based audio playback
  • Loading branch information
tannewt authored Feb 11, 2021
2 parents e15f157 + 48d4d2b commit aae10fb
Show file tree
Hide file tree
Showing 35 changed files with 948 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*.deb binary
*.zip binary
*.pdf binary
*.wav binary

# These should also not be modified by git.
tests/basics/string_cr_conversion.py -text
Expand Down
19 changes: 19 additions & 0 deletions locale/circuitpython.pot
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ msgstr ""
#: ports/esp32s2/common-hal/pulseio/PulseOut.c
#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
#: ports/stm/peripherals/timers.c shared-bindings/pwmio/PWMOut.c
msgid "All timers in use"
msgstr ""
Expand Down Expand Up @@ -1446,9 +1447,14 @@ msgstr ""

#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
msgid "No DMA channel found"
msgstr ""

#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
msgid "No DMA pacing timer found"
msgstr ""

#: shared-module/adafruit_bus_device/I2CDevice.c
#, c-format
msgid "No I2C device at address: %x"
Expand Down Expand Up @@ -1724,6 +1730,10 @@ msgid ""
"constructor"
msgstr ""

#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
msgid "Pins must share PWM slice"
msgstr ""

#: py/builtinhelp.c
msgid "Plus any modules on the filesystem\n"
msgstr ""
Expand Down Expand Up @@ -1963,6 +1973,14 @@ msgstr ""
msgid "Stack size must be at least 256"
msgstr ""

#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
msgid "Stereo left must be on PWM channel A"
msgstr ""

#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
msgid "Stereo right must be on PWM channel B"
msgstr ""

#: shared-bindings/multiterminal/__init__.c
msgid "Stream missing readinto() or write() method."
msgstr ""
Expand Down Expand Up @@ -2126,6 +2144,7 @@ msgstr ""

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

Expand Down
1 change: 1 addition & 0 deletions ports/raspberrypi/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ SRC_C += \
bindings/rp2pio/__init__.c \
common-hal/rp2pio/StateMachine.c \
common-hal/rp2pio/__init__.c \
audio_dma.c \
background.c \
peripherals/pins.c \
fatfs_port.c \
Expand Down
Loading

0 comments on commit aae10fb

Please sign in to comment.