Merge pull request #837 from kattni/cpb-cpx-audio-out-update

Update Audio Out for CPB and 5.x

Author: kattni

Introducing_CircuitPlaygroundExpress/CircuitPlaygroundExpress_AudioFiles.py

@@ -1,13 +1,25 @@
-import audioio
 import board
 import digitalio
 
-# enable the speaker
+try:
+    from audiocore import WaveFile
+except ImportError:
+    from audioio import WaveFile
+
+try:
+    from audioio import AudioOut
+except ImportError:
+    try:
+        from audiopwmio import PWMAudioOut as AudioOut
+    except ImportError:
+        pass  # not always supported by every board!
+
+# Enable the speaker
 spkrenable = digitalio.DigitalInOut(board.SPEAKER_ENABLE)
 spkrenable.direction = digitalio.Direction.OUTPUT
 spkrenable.value = True
 
-# make the 2 input buttons
+# Make the 2 input buttons
 buttonA = digitalio.DigitalInOut(board.BUTTON_A)
 buttonA.direction = digitalio.Direction.INPUT
 buttonA.pull = digitalio.Pull.DOWN
@@ -23,8 +35,8 @@
 def play_file(filename):
     print("Playing file: " + filename)
     wave_file = open(filename, "rb")
-    with audioio.WaveFile(wave_file) as wave:
-        with audioio.AudioOut(board.A0) as audio:
+    with WaveFile(wave_file) as wave:
+        with AudioOut(board.SPEAKER) as audio:
             audio.play(wave)
             while audio.playing:
                 pass

Introducing_CircuitPlaygroundExpress/CircuitPlaygroundExpress_AudioSine.py

@@ -1,10 +1,22 @@
 import time
 import array
 import math
-import audioio
 import board
 import digitalio
 
+try:
+    from audiocore import RawSample
+except ImportError:
+    from audioio import RawSample
+
+try:
+    from audioio import AudioOut
+except ImportError:
+    try:
+        from audiopwmio import PWMAudioOut as AudioOut
+    except ImportError:
+        pass  # not always supported by every board!
+
 FREQUENCY = 440  # 440 Hz middle 'A'
 SAMPLERATE = 8000  # 8000 samples/second, recommended!
 
@@ -14,14 +26,14 @@
 for i in range(length):
     sine_wave[i] = int(math.sin(math.pi * 2 * i / 18) * (2 ** 15) + 2 ** 15)
 
-# enable the speaker
+# Enable the speaker
 speaker_enable = digitalio.DigitalInOut(board.SPEAKER_ENABLE)
 speaker_enable.direction = digitalio.Direction.OUTPUT
 speaker_enable.value = True
 
-audio = audioio.AudioOut(board.A0)
-sine_wave_sample = audioio.RawSample(sine_wave)
+audio = AudioOut(board.SPEAKER)
+sine_wave_sample = RawSample(sine_wave)
 
-audio.play(sine_wave_sample, loop=True)  # keep playing the sample over and over
+audio.play(sine_wave_sample, loop=True)  # Keep playing the sample over and over
 time.sleep(1)  # until...
-audio.stop()  # we tell the board to stop
+audio.stop()  # We tell the board to stop