Merge pull request #64 from hexthat/patch-4

Update to support CP versions 3.0.0 to 5.0.0

Author: tannewt

adafruit_circuitplayground/express.py

@@ -51,6 +51,10 @@
 import adafruit_thermistor
 import analogio
 import audioio
+try:
+    import audiocore
+except ImportError:
+    audiocore = audioio
 import board
 import busio
 import digitalio
@@ -575,7 +579,7 @@ def _generate_sample(self, length=100):
         self._sine_wave = array.array("H", Express._sine_sample(length))
         if sys.implementation.version[0] >= 3:
             self._sample = audioio.AudioOut(board.SPEAKER)
-            self._sine_wave_sample = audioio.RawSample(self._sine_wave)
+            self._sine_wave_sample = audiocore.RawSample(self._sine_wave)
         else:
             raise NotImplementedError("Please use CircuitPython 3.0 or higher.")
 
@@ -683,7 +687,7 @@ def play_file(self, file_name):
         self._speaker_enable.value = True
         if sys.implementation.version[0] >= 3:
             with audioio.AudioOut(board.SPEAKER) as audio:
-                wavefile = audioio.WaveFile(open(file_name, "rb"))
+                wavefile = audiocore.WaveFile(open(file_name, "rb"))
                 audio.play(wavefile)
                 while audio.playing:
                     pass