Merge branch 'master' into fix-cal-id-pyportal

Author: brentru

ABC_Soundboards_for_NeoTrellis/code.py

@@ -3,6 +3,7 @@
 import time
 import board
 import audioio
+import audiocore
 import adafruit_fancyled.adafruit_fancyled as fancy
 import adafruit_trellism4
 
@@ -76,7 +77,7 @@
 with audioio.AudioOut(board.A1, right_channel=board.A0) as audio:
     try:
         f = open(SAMPLE_FOLDER+SAMPLES[27][0], "rb")  # Use 02.wav as welcome
-        wave = audioio.WaveFile(f)
+        wave = audiocore.WaveFile(f)
         audio.play(wave)
         swirl = 0  # we'll swirl through the colors in the gradient
         while audio.playing:
@@ -99,7 +100,7 @@
 bits_per_sample = None
 sample_rate = None
 with open(SAMPLE_FOLDER+SAMPLES[0][0], "rb") as f:
-    wav = audioio.WaveFile(f)
+    wav = audiocore.WaveFile(f)
     print("%d channels, %d bits per sample, %d Hz sample rate " %
           (wav.channel_count, wav.bits_per_sample, wav.sample_rate))
 
@@ -117,7 +118,7 @@
     filename = SAMPLE_FOLDER+v[0]
     try:
         with open(filename, "rb") as f:
-            wav = audioio.WaveFile(f)
+            wav = audiocore.WaveFile(f)
             print(filename,
                   "%d channels, %d bits per sample, %d Hz sample rate " %
                   (wav.channel_count, wav.bits_per_sample, wav.sample_rate))
@@ -162,7 +163,7 @@ def stop_playing_sample(playback_details):
         try:
             filename = SAMPLE_FOLDER+SAMPLES[sample_num][0]
             f = open(filename, "rb")
-            wav = audioio.WaveFile(f)
+            wav = audiocore.WaveFile(f)
 
             # is something else playing? interrupt it!
             if currently_playing['voice'] != None:

Adafruit_Prop_Maker_FeatherWing/Prop_Maker_Audio_Simpletest.py

@@ -3,6 +3,7 @@
 import digitalio
 import board
 import audioio
+import audiocore
 
 WAV_FILE_NAME = "StreetChicken.wav"  # Change to the name of your wav file!
 
@@ -12,7 +13,7 @@
 
 with audioio.AudioOut(board.A0) as audio:  # Speaker connector
     wave_file = open(WAV_FILE_NAME, "rb")
-    wave = audioio.WaveFile(wave_file)
+    wave = audiocore.WaveFile(wave_file)
 
     audio.play(wave)
     while audio.playing:

Adafruit_UDA1334A/CircuitPython_I2S_Tone.py

@@ -1,7 +1,7 @@
 import time
 import array
 import math
-import audioio
+import audiocore
 import board
 import audiobusio
 
@@ -18,7 +18,7 @@
 # audio = audiobusio.I2SOut(board.D1, board.D10, board.D11)
 # For Metro M4 Express
 # audio = audiobusio.I2SOut(board.D3, board.D9, board.D8)
-sine_wave_sample = audioio.RawSample(sine_wave)
+sine_wave_sample = audiocore.RawSample(sine_wave)
 
 while True:
     audio.play(sine_wave_sample, loop=True)

Adafruit_UDA1334A/CircuitPython_I2S_Wave.py

@@ -1,9 +1,9 @@
-import audioio
+import audiocore
 import board
 import audiobusio
 
 wave_file = open("StreetChicken.wav", "rb")
-wave = audioio.WaveFile(wave_file)
+wave = audiocore.WaveFile(wave_file)
 
 # For Feather M0 Express, ItsyBitsy M0 Express, Metro M0 Express
 audio = audiobusio.I2SOut(board.D1, board.D0, board.D9)

Animatronic_Hand/binary_counting.py

@@ -3,6 +3,7 @@
 import time
 from digitalio import DigitalInOut, Direction, Pull
 import audioio
+import audiocore
 import board
 from adafruit_crickit import crickit
 
@@ -22,7 +23,7 @@
 cpx_audio = audioio.AudioOut(board.A0)
 def play_file(wavfile):
     with open(wavfile, "rb") as f:
-        wav = audioio.WaveFile(f)
+        wav = audiocore.WaveFile(f)
         cpx_audio.play(wav)
         while cpx_audio.playing:
             pass

CP101_StateMachines/brute-force/code.py

@@ -21,6 +21,7 @@
 import busio
 import adafruit_ds3231
 import audioio
+import audiocore
 import pulseio
 from adafruit_motor import servo
 import neopixel
@@ -227,7 +228,7 @@ def shower(time_now):
 
 def start_playing(fname):
     sound_file = open(fname, 'rb')
-    wav = audioio.WaveFile(sound_file)
+    wav = audiocore.WaveFile(sound_file)
     audio.play(wav, loop=False)
 
 def stop_playing():

CP101_StateMachines/classes/code.py

@@ -21,6 +21,7 @@
 import busio
 import adafruit_ds3231
 import audioio
+import audiocore
 import pulseio
 from adafruit_motor import servo
 import neopixel
@@ -191,7 +192,7 @@ def shower(machine, time_now):
 
 def start_playing(fname):
     sound_file = open(fname, 'rb')
-    wav = audioio.WaveFile(sound_file)
+    wav = audiocore.WaveFile(sound_file)
     audio.play(wav, loop=False)
 
 def stop_playing():

CPX_DAC_Guide/scope_xy_adafruitlogo.py

@@ -34,6 +34,7 @@
 
 import board
 import audioio
+import audiocore
 import analogio
 
 ### Vector data for logo
@@ -95,7 +96,7 @@ def addpoints(points, min_dist):
 ### 32768 and 32000 exhibit this bug but 25000 so far appears to be a
 ### workaround, albeit a mysterious one
 ### https://github.com/adafruit/circuitpython/issues/1992
-### Using "h" for audioio.RawSample() DAC range will be 20268 to 45268
+### Using "h" for audiocore.RawSample() DAC range will be 20268 to 45268
 dac_x_min = 0
 dac_y_min = 0
 dac_x_max = 25000
@@ -129,7 +130,7 @@ def addpoints(points, min_dist):
 
 ### A0 will be x, A1 will be y
 if use_wav:
-    print("Using audioio.RawSample for DACs")
+    print("Using audiocore.RawSample for DACs")
     dacs = audioio.AudioOut(board.A0, right_channel=board.A1)
 else:
     print("Using analogio.AnalogOut for DACs")
@@ -166,7 +167,7 @@ def addpoints(points, min_dist):
     if use_wav:
         ### 200k (maybe 166.667k) seems to be practical limit
         ### 1M permissible but seems same as around 200k
-        output_wave = audioio.RawSample(rawdata,
+        output_wave = audiocore.RawSample(rawdata,
                                         channel_count=2,
                                         sample_rate=200 * 1000)
 

CPX_Sound_Box/code.py

@@ -2,6 +2,7 @@
 import board
 from digitalio import DigitalInOut, Direction, Pull
 import audioio
+import audiocore
 import neopixel
 
 filename = "electrons.wav"
@@ -37,7 +38,7 @@ def simpleCircle(wait):
 def play_file(playname):
     print("Playing File " + playname)
     wave_file = open(playname, "rb")
-    with audioio.WaveFile(wave_file) as wave:
+    with audiocore.WaveFile(wave_file) as wave:
         with audioio.AudioOut(board.A0) as audio:
             audio.play(wave)
             while audio.playing:

Cat_Treat_Dispenser/code.py

@@ -1,6 +1,7 @@
 import time
 import board
 import audioio
+import audiocore
 from adafruit_crickit import crickit
 
 print("Cat Feeder")
@@ -10,7 +11,7 @@
 # audio output
 cpx_audio = audioio.AudioOut(board.A0)
 f = open("activate.wav", "rb")
-wav = audioio.WaveFile(f)
+wav = audiocore.WaveFile(f)
 
 while True:
     if crickit.touch_1.value:

Christmas_Soundboard/code.py

@@ -1,6 +1,7 @@
 import time
 import board
 import audioio
+import audiocore
 import adafruit_fancyled.adafruit_fancyled as fancy
 import adafruit_trellism4
 from color_names import * # pylint: disable=wildcard-import,unused-wildcard-import
@@ -56,7 +57,7 @@
 with audioio.AudioOut(board.A1, right_channel=board.A0) as audio:
     try:
         f = open("welcome.wav", "rb")
-        wave = audioio.WaveFile(f)
+        wave = audiocore.WaveFile(f)
         audio.play(wave)
         swirl = 0  # we'll swirl through the colors in the gradient
         while audio.playing:
@@ -81,7 +82,7 @@
 bits_per_sample = None
 sample_rate = None
 with open(SAMPLE_FOLDER+SAMPLES[0][0], "rb") as f:
-    wav = audioio.WaveFile(f)
+    wav = audiocore.WaveFile(f)
     print("%d channels, %d bits per sample, %d Hz sample rate " %
           (wav.channel_count, wav.bits_per_sample, wav.sample_rate))
 
@@ -102,7 +103,7 @@
     filename = SAMPLE_FOLDER+v[0]
     try:
         with open(filename, "rb") as f:
-            wav = audioio.WaveFile(f)
+            wav = audiocore.WaveFile(f)
             print(filename,
                   "%d channels, %d bits per sample, %d Hz sample rate " %
                   (wav.channel_count, wav.bits_per_sample, wav.sample_rate))
@@ -147,7 +148,7 @@ def stop_playing_sample(playback_details):
         try:
             filename = SAMPLE_FOLDER+SAMPLES[sample_num][0]
             f = open(filename, "rb")
-            wav = audioio.WaveFile(f)
+            wav = audiocore.WaveFile(f)
 
             # is something else playing? interrupt it!
             if currently_playing['voice'] != None:

CircuitPython_Star_Gazer/code.py

@@ -68,8 +68,9 @@
 # music!
 if PLAY_SOUND_ON_CHANGE:
     import audioio
+    import audiocore
     wave_file = open("coin.wav", "rb")
-    wave = audioio.WaveFile(wave_file)
+    wave = audiocore.WaveFile(wave_file)
 
 # we'll save the value in question
 last_value = value = 0

CircuitPython_WeatherCloud/code.py

@@ -1,6 +1,7 @@
 import time
 import random
 import audioio
+import audiocore
 import board
 import busio
 from digitalio import DigitalInOut
@@ -16,7 +17,7 @@
 button.switch_to_input(pull=digitalio.Pull.UP)
 
 wave_file = open("sound/Rain.wav", "rb")
-wave = audioio.WaveFile(wave_file)
+wave = audiocore.WaveFile(wave_file)
 audio = audioio.AudioOut(board.A0)
 
 
@@ -130,17 +131,17 @@
             if weather_type == 'Sunny':
                 palette = sunny_palette
                 wave_file = open("sound/Clear.wav", "rb")
-                wave = audioio.WaveFile(wave_file)
+                wave = audiocore.WaveFile(wave_file)
                 has_sound = True
             if weather_type == 'Clouds':
                 palette = cloudy_palette
                 wave_file = open("sound/Clouds.wav", "rb")
-                wave = audioio.WaveFile(wave_file)
+                wave = audiocore.WaveFile(wave_file)
                 has_sound = True
             if weather_type == 'Rain':
                 palette = cloudy_palette
                 wave_file = open("sound/Rain.wav", "rb")
-                wave = audioio.WaveFile(wave_file)
+                wave = audiocore.WaveFile(wave_file)
                 raining = True
                 has_sound = True
             if weather_type == 'Thunderstorm':
@@ -152,7 +153,7 @@
             if weather_type == 'Snow':
                 palette = cloudy_palette
                 wave_file = open("sound/Snow.wav", "rb")
-                wave = audioio.WaveFile(wave_file)
+                wave = audiocore.WaveFile(wave_file)
                 snowing = True
                 has_sound = True
             weather_refresh = time.monotonic()
@@ -204,6 +205,6 @@
             wave_file = open("sound/Thunderstorm1.wav", "rb")
         elif Thunder == 2:
             wave_file = open("sound/Thunderstorm2.wav", "rb")
-        wave = audioio.WaveFile(wave_file)
+        wave = audiocore.WaveFile(wave_file)
         audio.play(wave)
         next_bolt_time = time.monotonic() + random.randint(5, 15)  # between 5 and 15 s

Circuit_Playground_Express_Rocket_Lamp/code.py

@@ -14,6 +14,7 @@
 import neopixel
 import digitalio
 import audioio
+import audiocore
 
 # enables the speaker for audio output
 spkrenable = digitalio.DigitalInOut(board.SPEAKER_ENABLE)
@@ -49,7 +50,7 @@ def play_audio():
     #open the file
     wave_file = open("liftoff.wav", "rb")
     #play the file
-    with audioio.WaveFile(wave_file) as wave:
+    with audiocore.WaveFile(wave_file) as wave:
         with audioio.AudioOut(board.A0) as audio:
             audio.play(wave)
             #wait until audio is done

Circuit_Playground_Express_USB_MIDI/cpx-basic-synth.py

@@ -37,6 +37,7 @@
 
 import digitalio
 import audioio
+import audiocore
 import board
 import usb_midi
 import neopixel
@@ -90,7 +91,7 @@ def waveform_sawtooth(length, waves, volumes):
                                                     * twopi
                                                     + math.pi))
                                for idx in list(range(length))])
-        waves.append((audioio.RawSample(waveraw), waveraw))
+        waves.append((audiocore.RawSample(waveraw), waveraw))
 
 # Make some square waves of different volumes volumes, generated with
 # n=10;[round(math.sqrt(x)/n*32767*n/math.sqrt(n)) for x in range(1, n+1)]

Crickit_Hello_World/code.py

@@ -1,5 +1,6 @@
 import time
 import audioio
+import audiocore
 import board
 import neopixel
 from adafruit_crickit import crickit
@@ -10,7 +11,7 @@
 # Start playing the file (in the background)
 def play_file(wavfile):
     audio_file = open(wavfile, "rb")
-    wav = audioio.WaveFile(audio_file)
+    wav = audiocore.WaveFile(audio_file)
     speaker.play(wav)
     while speaker.playing:
         pass

Crickit_Sparky_Automaton/code.py

@@ -3,6 +3,7 @@
 import random
 import board
 import audioio
+import audiocore
 from adafruit_crickit import crickit
 
 # Sparky automaton
@@ -31,7 +32,7 @@
 def play_file(wavfile):
     print("Playing", wavfile)
     with open(wavfile, "rb") as f:
-        wav = audioio.WaveFile(f)
+        wav = audiocore.WaveFile(f)
         a.play(wav)
         while a.playing:  # turn servos, motors, etc. during playback
             mouth_servo.angle = MOUTH_END