Skip to content

tone: Work with 4.x, 5.0; AudioOut and PWMAudioOut #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 16, 2019
Merged

tone: Work with 4.x, 5.0; AudioOut and PWMAudioOut #46

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f72b3e5
tone: Work with 4.x, 5.0; AudioOut and PWMAudioOut
jepler Sep 11, 2019
18807c1
pylint: Silence some expected pylint errors
jepler Sep 11, 2019
76b86b4
pylint: remove unneeded import
jepler Sep 11, 2019
992f6b1
revisions based on review comments from @ladyada
jepler Sep 12, 2019
9a580b5
Rearrange imports to satisfy linter error `ungrouped-imports`
jepler Sep 12, 2019
4bc5cfc
fix audioio import for boards without it (and docs)
jepler Sep 12, 2019
429426b
Further rearrange audio imports
jepler Sep 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions simpleio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,22 @@
"""
import time
import sys
try:
import audioio
except ImportError:
pass # not always supported by every board!
import array
import digitalio
import pulseio
try:
# RawSample was moved in CircuitPython 5.x.
if sys.implementation.version[0] >= 5:
import audiocore
else:
import audioio as audiocore
# Some boards have AudioOut (true DAC), others have PWMAudioOut.
try:
from audioio import AudioOut
except ImportError:
from audiopwmio import PWMAudioOut as AudioOut
except ImportError:
pass # not always supported by every board!

def tone(pin, frequency, duration=1, length=100):
"""
Expand All @@ -61,21 +70,13 @@ def tone(pin, frequency, duration=1, length=100):
square_wave = array.array("H", [0] * sample_length)
for i in range(sample_length / 2):
square_wave[i] = 0xFFFF
if sys.implementation.version[0] >= 3:
square_wave_sample = audioio.RawSample(square_wave)
square_wave_sample.sample_rate = int(len(square_wave) * frequency)
with audioio.AudioOut(pin) as dac:
if not dac.playing:
dac.play(square_wave_sample, loop=True)
time.sleep(duration)
dac.stop()
else:
sample_tone = audioio.AudioOut(pin, square_wave)
sample_tone.frequency = int(len(square_wave) * frequency)
if not sample_tone.playing:
sample_tone.play(loop=True)
square_wave_sample = audiocore.RawSample(square_wave)
square_wave_sample.sample_rate = int(len(square_wave) * frequency)
with AudioOut(pin) as dac:
if not dac.playing:
dac.play(square_wave_sample, loop=True)
time.sleep(duration)
sample_tone.stop()
dac.stop()



Expand Down