start_tone / stop_tone implemented.

.gitignore

@@ -5,4 +5,4 @@ dist
 _build/
 *.mpy
 build/
-
+.DS_Store

adafruit_circuitplayground/express.py

@@ -191,6 +191,18 @@ def red_led(self):
     def red_led(self, value):
         self._led.value = value
 
+    def sine_sample(length):
+        TONE_VOLUME = (2 ** 15) - 1
+        shift = 2 ** 15
+        for i in range(length):
+            yield int(TONE_VOLUME * math.sin(2*math.pi*(i / length)) + shift)
+
+    length = 100  # Amount of samples in the sine wave.
+    sine_wave = array.array("H", sine_sample(length))
+
+    # Initialize the audio output to play the generated sine wave.
+    sample = audioio.AudioOut(board.SPEAKER, sine_wave)
+
     def play_tone(self, frequency, duration):
         """ Produce a tone using the speaker. Try changing frequency to change
         the pitch of the tone.
@@ -206,19 +218,64 @@ def play_tone(self, frequency, duration):
 
             circuit.play_tone(440, 1)
         """
-        length = 8000 // frequency
-        sine_wave = array.array("H", [0] * length)
-        for i in range(length):
-            sine_wave[i] = int(math.sin(math.pi * 2 * i / 18) * (2 ** 15) + 2 ** 15)
-
-        sample = audioio.AudioOut(board.SPEAKER, sine_wave)
 
         self.speaker_enable.value = True
 
-        sample.play(loop=True)
+        # Play a tone of the specified frequency (hz).
+        self.sample.frequency = int(len(self.sine_wave) * frequency)
+        if not self.sample.playing:
+            self.sample.play(loop=True)
         time.sleep(duration)
-        sample.stop()
+        if self.sample.playing:
+            self.sample.stop()
+        self.speaker_enable.value = False
+
+    def start_tone(self, frequency):
+        """ Produce a tone using the speaker. Try changing frequency to change
+        the pitch of the tone.
+
+        :param int frequency: The frequency of the tone in Hz
+
+        .. image :: /_static/speaker.jpg
+
+        .. code-block:: python
 
+             from adafruit_circuitplayground.express import circuit
+
+             while True:
+                 if circuit.button_a:
+                     circuit.start_tone(262)
+                 elif circuit.button_b:
+                     circuit.start_tone(294)
+                 else:
+                     circuit.stop_tone()
+        """
+        self.speaker_enable.value = True
+        # Start playing a tone of the specified frequency (hz).
+        self.sample.frequency = int(len(self.sine_wave) * frequency)
+        if not self.sample.playing:
+            self.sample.play(loop=True)
+
+    def stop_tone(self):
+        """ Use with start_tone to stop the tone produced.
+
+        .. image :: /_static/speaker.jpg
+
+        .. code-block:: python
+
+             from adafruit_circuitplayground.express import circuit
+
+             while True:
+                 if circuit.button_a:
+                     circuit.start_tone(262)
+                 elif circuit.button_b:
+                     circuit.start_tone(294)
+                 else:
+                     circuit.stop_tone()
+        """
+        # Stop playing any tones.
+        if self.sample.playing:
+            self.sample.stop()
         self.speaker_enable.value = False