Skip to content

Fixing self._sample typo in sound_level #53 #54

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 2 commits into from
Jan 23, 2022
Merged

Fixing self._sample typo in sound_level #53 #54

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87a87ca
Fixing self._sample typo in sound_level #53
Jan 23, 2022
36ddf4a
rename "sample" variables to avoid confusion
dhalbert Jan 23, 2022
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
28 changes: 14 additions & 14 deletions adafruit_clue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,10 @@ def __init__(self):
sample_rate=16000,
bit_depth=16,
)
self._sample = None
self._samples = None
self._audio_out = None
self._sine_wave = None
self._sine_wave_sample = None
self._mic_samples = None

# Define sensors:
# Accelerometer/gyroscope:
Expand Down Expand Up @@ -689,10 +689,10 @@ def _sine_sample(length):
yield int(tone_volume * math.sin(2 * math.pi * (i / length)) + shift)

def _generate_sample(self, length=100):
if self._sample is not None:
if self._audio_out is not None:
return
self._sine_wave = array.array("H", self._sine_sample(length))
self._sample = audiopwmio.PWMAudioOut(board.SPEAKER)
self._audio_out = audiopwmio.PWMAudioOut(board.SPEAKER)
self._sine_wave_sample = audiocore.RawSample(self._sine_wave)

def play_tone(self, frequency, duration):
Expand Down Expand Up @@ -752,8 +752,8 @@ def start_tone(self, frequency):
self._generate_sample(length)
# Start playing a tone of the specified frequency (hz).
self._sine_wave_sample.sample_rate = int(len(self._sine_wave) * frequency)
if not self._sample.playing:
self._sample.play(self._sine_wave_sample, loop=True)
if not self._audio_out.playing:
self._audio_out.play(self._sine_wave_sample, loop=True)

def stop_tone(self):
"""Use with start_tone to stop the tone produced.
Expand All @@ -779,10 +779,10 @@ def stop_tone(self):
clue.stop_tone()
"""
# Stop playing any tones.
if self._sample is not None and self._sample.playing:
self._sample.stop()
self._sample.deinit()
self._sample = None
if self._audio_out is not None and self._audio_out.playing:
self._audio_out.stop()
self._audio_out.deinit()
self._audio_out = None

@staticmethod
def _normalized_rms(values):
Expand Down Expand Up @@ -812,10 +812,10 @@ def sound_level(self):
while True:
print(clue.sound_level)
"""
if self._sample is None:
self._samples = array.array("H", [0] * 160)
self._mic.record(self._samples, len(self._samples))
return self._normalized_rms(self._samples)
if self._mic_samples is None:
self._mic_samples = array.array("H", [0] * 160)
self._mic.record(self._mic_samples, len(self._mic_samples))
return self._normalized_rms(self._mic_samples)

def loud_sound(self, sound_threshold=200):
"""Utilise a loud sound as an input.
Expand Down