From 07f07556095ed0ccdba79694988477fe071ef5ac Mon Sep 17 00:00:00 2001 From: pschatzmann Date: Fri, 9 Feb 2024 14:37:16 +0100 Subject: [PATCH] audiokit example migration --- examples/build-examples-log.txt | 25 ++++++++++++++----- .../basic-a2dp-audiokit/README.md | 4 +-- .../basic-a2dp-audiokit.ino | 8 +++--- .../basic-a2dp-eq-audiokit/README.md | 4 +-- .../basic-a2dp-eq-audiokit.ino | 9 ++++--- .../basic-audiokit-a2dp.ino | 6 ++--- .../player-sd-audiokit/README.md | 2 +- .../player-sd-audiokit/player-sd-audiokit.ino | 10 ++++---- .../player-sd_a2dp-audiokit.ino | 8 +++--- .../player-sdfat-audiokit/README.md | 2 +- .../player-sdfat-audiokit.ino | 12 ++++----- .../player-sdmmc-audiokit/README.md | 2 +- .../player-sdmmc-audiokit.ino | 4 +-- .../player-url_icy-audiokit/README.md | 2 +- .../player-url_icy-audiokit.ino | 8 +++--- .../stream-hls-audiokit.ino | 4 +-- .../streams-a2dp-audiokit.ino | 4 +-- .../streams-audiokit-audiokit/README.md | 2 +- .../streams-audiokit-audiokit.ino | 6 ++--- .../streams-audiokit-effects-audiokit.ino | 6 ++--- .../streams-audiokit-fft-led.ino | 6 ++--- .../streams-audiokit-fft/README.md | 2 +- .../streams-audiokit-fft.ino | 6 ++--- .../streams-audiokit-filter-audiokit.ino | 6 ++--- .../streams-audiokit-multioutput-server.ino | 6 ++--- .../streams-audiokit-multioutput.ino | 6 ++--- .../streams-audiokit-ram-audiokit.ino | 8 +++--- ...reams-audiokit-ram-ptichshift-audiokit.ino | 8 +++--- .../streams-audiokit-sd-audiokit.ino | 8 +++--- .../streams-audiokit-sd_wav.ino | 6 ++--- .../streams-audiokit-serial/README.md | 2 +- .../streams-audiokit-serial.ino | 6 ++--- .../streams-audiokit-tf/README.md | 2 +- .../streams-audiokit-tf.ino | 6 ++--- .../streams-audiokit-webserver_aac.ino | 9 +++---- .../streams-audiokit-webserver_wav.ino | 6 ++--- .../streams-file_loop-audiokit.ino | 4 +-- .../streams-generator-audiokit.ino | 4 +-- .../streams-generator_fromarray-audiokit.ino | 4 +-- .../streams-generator_inputmixer-audiokit.ino | 4 +-- ...streams-generator_outputmixer-audiokit.ino | 6 ++--- ...treams-generator_sinfromtable-audiokit.ino | 4 +-- .../streams-memory_mp3-audiokit.ino | 4 +-- .../streams-memory_pcm-mixer-audiokit.ino | 4 +-- .../streams-pins-audiokit/README.md | 2 +- .../streams-pins-audiokit.ino | 20 +++++++-------- .../streams-sd-audiokit.ino | 4 +-- .../streams-sdmmc_wav-audiokit.ino | 4 +-- .../streams-synth-a2dp/streams-synth-a2dp.ino | 8 +++--- .../streams-synth-audiokit.ino | 6 ++--- .../streams-synthbasic1-audiokit.ino | 16 ++++++------ .../streams-synthbasic2-audiokit.ino | 16 ++++++------ .../streams-synthbasic3-audiokit.ino | 16 ++++++------ .../streams-synthstk-audiokit/README.md | 2 +- .../streams-synthstk-audiokit.ino | 16 ++++++------ .../streams-tf-audiokit/README.md | 2 +- .../streams-tf-audiokit.ino | 4 +-- .../streams-url_aac-audiokit.ino | 4 +-- .../streams-url_mp3-audiokit.ino | 4 +-- .../base-player-a2dp/base-player-a2dp.ino | 2 +- .../communication-codec-espnow-receive.ino | 4 +-- .../ftp/ftp-client/ftp-client.ino | 4 +-- .../communication-audiokit-rtsp.ino | 6 ++--- .../communication-rtsp-audiokit.ino | 4 +-- .../send-8bit-receive/send-8bit-receive.ino | 4 +-- .../send-adpcm-receive/send-adpcm-receive.ino | 4 +-- .../send-adpcm_framed-receive.ino | 4 +-- .../serial/send-receive/send-receive.ino | 4 +-- .../communication-udp-receive.ino | 4 +-- .../streams-audiokit-vban.ino | 6 ++--- .../cross_band_handy_walkie_talkie.ino | 7 +++--- .../streams-faust_flute-i2s.ino | 4 +-- .../streams-faust_noise-i2s.ino | 4 +-- .../streams-generator-faust-i2s.ino | 4 +-- .../streams-i2s-faust_copy-i2s.ino | 4 +-- .../streams-i2s-faust_guitarix-i2s.ino | 6 ++--- .../streams-i2s-faust_pitchshift-i2s.ino | 4 +-- .../12-SamplePlayer/12-SamplePlayer.ino | 4 +-- .../player-sdfat-a2dp/player-sdfat-a2dp.ino | 1 - .../streams-stk-audiokit.ino | 6 ++--- .../streams-stk_allinstruments-audiokit.ino | 4 +-- .../streams-stk_files-audiokit.ino | 4 +-- .../streams-stk_generator-audiokit.ino | 4 +-- .../streams-stk_loop-audiokit.ino | 4 +-- .../streams-stk_myinstrument-audiokit.ino | 4 +-- .../streams-stk_sine-audiokit.ino | 4 +-- .../streams-stk_synth-audiokit/README.md | 2 +- .../streams-stk_synth-audiokit.ino | 16 ++++++------ .../streams-adsr-i2s/streams-adsr-i2s.ino | 4 +-- .../streams-generator-formatconverter-i2s.ino | 4 +-- .../streams-generator_fromarray-analog.ino | 2 +- .../streams-espeak-audiokit.ino | 4 +-- .../streams-flite-audiokit/README.md | 2 +- .../streams-flite-audiokit.ino | 4 +-- .../streams-flite-i2s/streams-flite-i2s.ino | 4 +-- .../streams-google-audiokit.ino | 4 +-- .../streams-sam-audiokit/README.md | 2 +- .../streams-sam-audiokit.ino | 4 +-- .../streams-sam-i2s/streams-sam-i2s.ino | 4 +-- .../streams-simple_tts-i2s.ino | 4 +-- .../streams-tts-i2s/streams-tts-i2s.ino | 4 +-- .../streams-url_wav-i2s.ino | 2 +- .../communication-ble-server-receive.ino | 4 +-- .../communication-ble-client-receive.ino | 2 +- examples/sandbox/ggwave/receive/receive.ino | 6 ++--- examples/sandbox/ggwave/send/send.ino | 4 +-- .../send-hdlc-receive/send-hdlc-receive.ino | 2 +- .../test-container-avi/test-container-avi.ino | 4 +-- .../24bits/24bits-write/24bits-write.ino | 4 +-- .../callback-write/callback-write.ino | 4 +-- .../test-codec-adpcm-xq.ino | 6 ++--- .../test-codec-adpcm/test-codec-adpcm.ino | 6 ++--- .../test-codec-aptx/test-codec-aptx.ino | 6 ++--- .../test-codec-base64/test-codec-base64.ino | 4 +-- .../test-codec-codec2/test-codec-codec2.ino | 4 +-- .../test-codec-flac/test-codec-flac.ino | 2 +- .../test-codec-g711_alaw.ino | 4 +-- .../test-codec-g711_ulaw.ino | 4 +-- .../test-codec-g721/test-codec-g721.ino | 4 +-- .../test-codec-g722/test-codec-g722.ino | 4 +-- .../test-codec-g723_24/test-codec-g723_24.ino | 4 +-- .../test-codec-g723_40/test-codec-g723_40.ino | 4 +-- .../codecs/test-codec-gsm/test-codec-gsm.ino | 4 +-- .../test-codec-iLBC/test-codec-iLBC.ino | 4 +-- .../codecs/test-codec-l8/test-codec-l8.ino | 4 +-- .../codecs/test-codec-lc3/test-codec-lc3.ino | 4 +-- .../test-codec-opus/test-codec-opus.ino | 4 +-- .../test-codec-opusogg/test-codec-opusogg.ino | 4 +-- .../codecs/test-codec-sbc/test-codec-sbc.ino | 4 +-- .../test-container-binary-meta.ino | 4 +-- .../test-container-binary.ino | 4 +-- .../test-container-ogg/test-container-ogg.ino | 4 +-- .../test-mp3-helix-reading.ino | 4 +-- .../codecs/test-mp3-helix/test-mp3-helix.ino | 4 +-- .../codecs/test-mp3-mad/test-mp3-mad.ino | 4 +-- examples/tests/communications/hdlc/hdlc.ino | 4 +-- .../test-median-filter/test-median-filter.ino | 4 +-- .../tests/performance/mp3-Speed/mp3-Speed.ino | 5 +--- .../mp3-SynchronizedBufferRTOS.ino | 2 +- .../mp3-SynchronizedNBuffer.ino | 2 +- .../mp3-SynchronizedRingBuffer.ino | 2 +- .../tests/sd/test-index-sd/test-index-sd.ino | 2 +- .../sd/test-index-sdfat/test-index-sdfat.ino | 2 +- .../sd/test-index-sdmmc/test-index-sdmmc.ino | 2 +- .../volume/test-panning/test-panning.ino | 4 +-- 145 files changed, 364 insertions(+), 358 deletions(-) diff --git a/examples/build-examples-log.txt b/examples/build-examples-log.txt index fb61b4d95..b67057ffa 100644 --- a/examples/build-examples-log.txt +++ b/examples/build-examples-log.txt @@ -1,4 +1,6 @@ ../examples/examples-basic-api/base-adc-a2dp -> rc=0 +../examples/examples-basic-api/base-adc-average-mono-serial -> rc=0 +../examples/examples-basic-api/base-adc-measure -> rc=0 ../examples/examples-basic-api/base-adc-serial -> rc=0 ../examples/examples-basic-api/base-file_raw-serial -> rc=0 ../examples/examples-basic-api/base-generator-a2dp -> rc=0 @@ -21,7 +23,7 @@ ../examples/examples-webserver/streams-generator-webserver_aac -> rc=0 ../examples/examples-webserver/streams-generator-webserverex_wav -> rc=0 ../examples/examples-webserver/streams-generator-webserverex_wav1 -> rc=0 -../examples/examples-webserver/streams-generator-webserver_mp3 -> rc=1/0 +../examples/examples-webserver/streams-generator-webserver_mp3 -> rc=1 ../examples/examples-webserver/streams-generator-webserver_ogg -> rc=0 ../examples/examples-webserver/streams-generator-webserver_wav -> rc=0 ../examples/examples-webserver/streams-i2s-webserver_wav -> rc=0 @@ -36,6 +38,7 @@ ../examples/examples-stream/streams-generator-formatconverter-i2s -> rc=0 ../examples/examples-stream/streams-generator_fromarray-analog -> rc=0 ../examples/examples-stream/streams-generator-i2s -> rc=0 +../examples/examples-stream/streams-generator-merge-pwm -> rc=0 ../examples/examples-stream/streams-generator-pwm -> rc=0 ../examples/examples-stream/streams-generator-serial -> rc=0 ../examples/examples-stream/streams-generator-spdif -> rc=0 @@ -70,19 +73,20 @@ ../examples/examples-stream/streams-url_mp3_mad-i2s -> rc=0 ../examples/examples-stream/streams-url_mp3-metadata -> rc=0 ../examples/examples-stream/streams-url_mp3-metadata2 -> rc=0 +../examples/examples-stream/streams-url_mts-hex -> rc=0 ../examples/examples-stream/streams-url_raw-i2s -> rc=0 ../examples/examples-stream/streams-url_raw-serial -> rc=0 -../examples/examples-stream/streams-url_vorbis_i2s -> rc=0 -../examples/examples-stream/streams-url_wav-i2s -> rc=1 +../examples/examples-stream/streams-url_vorbis_i2s -> rc=1 ../examples/examples-audiokit/basic-a2dp-audiokit -> rc=0 ../examples/examples-audiokit/basic-a2dp-eq-audiokit -> rc=0 ../examples/examples-audiokit/basic-audiokit-a2dp -> rc=0 ../examples/examples-audiokit/player-sd_a2dp-audiokit -> rc=0 ../examples/examples-audiokit/player-sd-audiokit -> rc=0 -../examples/examples-audiokit/player-sdfat-audiokit -> rc=0 +../examples/examples-audiokit/player-sdfat-audiokit -> rc=1 ../examples/examples-audiokit/player-sdmmc-audiokit -> rc=0 ../examples/examples-audiokit/player-url_icy-audiokit -> rc=0 ../examples/examples-audiokit/README.md -> rc=1 +../examples/examples-audiokit/stream-hls-audiokit -> rc=0 ../examples/examples-audiokit/streams-a2dp-audiokit -> rc=0 ../examples/examples-audiokit/streams-audiokit-audiokit -> rc=0 ../examples/examples-audiokit/streams-audiokit-effects-audiokit -> rc=0 @@ -109,6 +113,7 @@ ../examples/examples-audiokit/streams-memory_pcm-mixer-audiokit -> rc=0 ../examples/examples-audiokit/streams-pins-audiokit -> rc=0 ../examples/examples-audiokit/streams-sd-audiokit -> rc=0 +../examples/examples-audiokit/streams-sdmmc_wav-audiokit -> rc=0 ../examples/examples-audiokit/streams-synth-a2dp -> rc=0 ../examples/examples-audiokit/streams-synth-audiokit -> rc=0 ../examples/examples-audiokit/streams-synthbasic1-audiokit -> rc=0 @@ -141,19 +146,24 @@ ../examples/examples-maximilian/19-Enveloping2 -> rc=0 ../examples/examples-maximilian/20-FFT -> rc=0 ../examples/examples-maximilian/README.md -> rc=1 -../examples/examples-tts/streams-azure_tts-i2s -> rc=1 +../examples/examples-tts/streams-azure_tts-i2s -> rc=0 ../examples/examples-tts/streams-espeak-audiokit -> rc=0 ../examples/examples-tts/streams-espeak-i2s -> rc=0 ../examples/examples-tts/streams-flite-audiokit -> rc=0 ../examples/examples-tts/streams-flite-i2s -> rc=0 +../examples/examples-tts/streams-google-audiokit -> rc=0 ../examples/examples-tts/streams-sam-audiokit -> rc=0 ../examples/examples-tts/streams-sam-i2s -> rc=0 +../examples/examples-tts/streams-simple_tts-a2dp -> rc=0 ../examples/examples-tts/streams-simple_tts-i2s -> rc=0 ../examples/examples-tts/streams-tts-i2s -> rc=0 +../examples/examples-tts/streams-url_wav-i2s -> rc=0 ../examples/examples-faust/streams-faust_flute-i2s -> rc=0 ../examples/examples-faust/streams-faust_noise-i2s -> rc=0 ../examples/examples-faust/streams-generator-faust-i2s -> rc=0 +../examples/examples-faust/streams-i2s-faust_copy-i2s -> rc=1 ../examples/examples-faust/streams-i2s-faust_guitarix-i2s -> rc=0 +../examples/examples-faust/streams-i2s-faust_pitchshift-i2s -> rc=0 ../examples/examples-communication/esp-now/codec/communication-codec-espnow-receive -> rc=0 ../examples/examples-communication/esp-now/codec/communication-codec-espnow-receive_measure -> rc=0 ../examples/examples-communication/esp-now/codec/communication-codec-espnow-send -> rc=0 @@ -169,9 +179,10 @@ ../examples/examples-communication/rtsp/communication-audiokit-rtsp -> rc=0 ../examples/examples-communication/rtsp/communication-codec-rtsp -> rc=0 ../examples/examples-communication/rtsp/communication-generator-rtsp -> rc=0 +../examples/examples-communication/rtsp/communication-rtsp-audiokit -> rc=1 +../examples/examples-communication/rtsp/communication-rtsp-i2s -> rc=0 ../examples/tests/test-ads1015 -> rc=0 ../examples/tests/test-bitvector -> rc=0 -../examples/tests/test-filter -> rc=0 ../examples/tests/test-list -> rc=0 ../examples/tests/test-memory-helix -> rc=0 ../examples/tests/test-mulit-compilation-units -> rc=0 @@ -179,6 +190,7 @@ ../examples/tests/test-player -> rc=0 ../examples/tests/test-resample-in -> rc=0 ../examples/tests/test-resample-out -> rc=0 +../examples/tests/test-vector -> rc=0 ../examples/tests/24bits/24bits-write -> rc=0 ../examples/tests/codecs/test-codec-adpcm -> rc=0 ../examples/tests/codecs/test-codec-adpcm-xq -> rc=0 @@ -227,6 +239,7 @@ ../examples/tests/performance/mp3-SynchronizedNBuffer -> rc=0 ../examples/tests/performance/mp3-SynchronizedRingBuffer -> rc=0 ../examples/tests/performance/sine -> rc=0 +../examples/tests/performance/throttle -> rc=0 ../examples/tests/performance/wifi -> rc=0 ../examples/tests/pitch-shift/pitch-shift -> rc=0 ../examples/tests/pitch-shift/pitch-shift-180 -> rc=0 diff --git a/examples/examples-audiokit/basic-a2dp-audiokit/README.md b/examples/examples-audiokit/basic-a2dp-audiokit/README.md index 94f979849..d1551b803 100644 --- a/examples/examples-audiokit/basic-a2dp-audiokit/README.md +++ b/examples/examples-audiokit/basic-a2dp-audiokit/README.md @@ -4,7 +4,7 @@ I found some cheap [AI Thinker ESP32 Audio Kit V2.2](https://docs.ai-thinker.com Audio Kit -I am using the data callback of the A2DP library to feed the AudioKitStream +I am using the data callback of the A2DP library to feed the AudioBoardStream You dont need to bother about any wires because everything is on one nice board. Just just need to install the dependencies: @@ -14,4 +14,4 @@ You need to install the following libraries: - https://github.com/pschatzmann/arduino-audio-tools - https://github.com/pschatzmann/ESP32-A2DP -- https://github.com/pschatzmann/arduino-audiokit +- https://github.com/pschatzmann/arduino-audio-driver diff --git a/examples/examples-audiokit/basic-a2dp-audiokit/basic-a2dp-audiokit.ino b/examples/examples-audiokit/basic-a2dp-audiokit/basic-a2dp-audiokit.ino index 81a66c832..b7f9d347e 100644 --- a/examples/examples-audiokit/basic-a2dp-audiokit/basic-a2dp-audiokit.ino +++ b/examples/examples-audiokit/basic-a2dp-audiokit/basic-a2dp-audiokit.ino @@ -7,14 +7,12 @@ */ #include "AudioTools.h" -//#include "AudioLibs/AudioKit.h" -#include "AudioLibs/AudioA2DP.h" -#include "AudioLibs/AudioBoardStream.h" +#include "AudioLibs/AudioA2DP.h" // install https://github.com/pschatzmann/ESP32-A2DP +#include "AudioLibs/AudioBoardStream.h" // install https://github.com/pschatzmann/arduino-audio-driver BluetoothA2DPSink a2dp_sink; -//AudioKitStream kit; -I2SCodecStream kit(AudioKitEs8388V1); +AudioBoardStream kit(AudioKitEs8388V1); // Write data to AudioKit in callback void read_data_stream(const uint8_t *data, uint32_t length) { diff --git a/examples/examples-audiokit/basic-a2dp-eq-audiokit/README.md b/examples/examples-audiokit/basic-a2dp-eq-audiokit/README.md index a061eddd6..ca7c6889a 100644 --- a/examples/examples-audiokit/basic-a2dp-eq-audiokit/README.md +++ b/examples/examples-audiokit/basic-a2dp-eq-audiokit/README.md @@ -4,7 +4,7 @@ I found some cheap [AI Thinker ESP32 Audio Kit V2.2](https://docs.ai-thinker.com Audio Kit -I am using the data callback of the A2DP library to feed the AudioKitStream that will be controlled by an Equilizer +I am using the data callback of the A2DP library to feed the AudioBoardStream that will be controlled by an Equilizer You dont need to bother about any wires because everything is on one nice board. Just just need to install the dependencies: @@ -14,4 +14,4 @@ You need to install the following libraries: - https://github.com/pschatzmann/arduino-audio-tools - https://github.com/pschatzmann/ESP32-A2DP -- https://github.com/pschatzmann/arduino-audiokit +- https://github.com/pschatzmann/arduino-audio-driver diff --git a/examples/examples-audiokit/basic-a2dp-eq-audiokit/basic-a2dp-eq-audiokit.ino b/examples/examples-audiokit/basic-a2dp-eq-audiokit/basic-a2dp-eq-audiokit.ino index f1d8fb74b..163a3e22b 100644 --- a/examples/examples-audiokit/basic-a2dp-eq-audiokit/basic-a2dp-eq-audiokit.ino +++ b/examples/examples-audiokit/basic-a2dp-eq-audiokit/basic-a2dp-eq-audiokit.ino @@ -7,12 +7,12 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" -#include "AudioLibs/AudioA2DP.h" +#include "AudioLibs/AudioA2DP.h" // install https://github.com/pschatzmann/ESP32-A2DP +#include "AudioLibs/AudioBoardStream.h" // install https://github.com/pschatzmann/arduino-audio-driver BluetoothA2DPSink a2dp_sink; -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); Equilizer3Bands eq(kit); ConfigEquilizer3Bands cfg_eq; @@ -31,6 +31,9 @@ void setup() { cfg.sd_active = false; kit.begin(cfg); + // max volume + kit.setVolume(1.0); + // setup equilizer cfg_eq = eq.defaultConfig(); cfg_eq.setAudioInfo(cfg); // use channels, bits_per_sample and sample_rate from kit diff --git a/examples/examples-audiokit/basic-audiokit-a2dp/basic-audiokit-a2dp.ino b/examples/examples-audiokit/basic-audiokit-a2dp/basic-audiokit-a2dp.ino index 0c6fa6c7b..8df6f24aa 100644 --- a/examples/examples-audiokit/basic-audiokit-a2dp/basic-audiokit-a2dp.ino +++ b/examples/examples-audiokit/basic-audiokit-a2dp/basic-audiokit-a2dp.ino @@ -6,12 +6,12 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/AudioA2DP.h" AudioInfo info(44100, 2, 16); BluetoothA2DPSource a2dp_source; -AudioKitStream i2s; +AudioBoardStream i2s(AudioKitEs8388V1); const int16_t BYTES_PER_FRAME = 4; // callback used by A2DP to provide the sound data - usually len is 128 2 channel int16 frames @@ -29,7 +29,7 @@ void setup(void) { auto cfg = i2s.defaultConfig(RX_MODE); cfg.i2s_format = I2S_STD_FORMAT; // or try with I2S_LSB_FORMAT cfg.copyFrom(info); - cfg.input_device = AUDIO_HAL_ADC_INPUT_LINE2; // microphone + cfg.input_device = ADC_INPUT_LINE2; // microphone i2s.begin(cfg); // start the bluetooth diff --git a/examples/examples-audiokit/player-sd-audiokit/README.md b/examples/examples-audiokit/player-sd-audiokit/README.md index 0ad58f2f2..74004fe98 100644 --- a/examples/examples-audiokit/player-sd-audiokit/README.md +++ b/examples/examples-audiokit/player-sd-audiokit/README.md @@ -18,4 +18,4 @@ You need to install the following libraries: - https://github.com/pschatzmann/arduino-audio-tools - https://github.com/pschatzmann/arduino-libhelix -- https://github.com/pschatzmann/arduino-audiokit +- https://github.com/pschatzmann/arduino-audio-driver diff --git a/examples/examples-audiokit/player-sd-audiokit/player-sd-audiokit.ino b/examples/examples-audiokit/player-sd-audiokit/player-sd-audiokit.ino index 894784fd8..bb95d1aba 100644 --- a/examples/examples-audiokit/player-sd-audiokit/player-sd-audiokit.ino +++ b/examples/examples-audiokit/player-sd-audiokit/player-sd-audiokit.ino @@ -8,14 +8,14 @@ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/AudioSourceSD.h" // or AudioSourceIdxSD.h #include "AudioCodecs/CodecMP3Helix.h" const char *startFilePath="/"; const char* ext="mp3"; AudioSourceSD source(startFilePath, ext, PIN_AUDIO_KIT_SD_CARD_CS); -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); MP3DecoderHelix decoder; // or change to MP3DecoderMAD AudioPlayer player(source, kit, decoder); @@ -43,9 +43,9 @@ void setup() { kit.begin(cfg); // setup additional buttons - kit.addAction(PIN_KEY1, startStop); - kit.addAction(PIN_KEY4, next); - kit.addAction(PIN_KEY3, previous); + kit.addAction(kit.getKey(1), startStop); + kit.addAction(kit.getKey(4), next); + kit.addAction(kit.getKey(3), previous); // setup player diff --git a/examples/examples-audiokit/player-sd_a2dp-audiokit/player-sd_a2dp-audiokit.ino b/examples/examples-audiokit/player-sd_a2dp-audiokit/player-sd_a2dp-audiokit.ino index fcf171e9a..6a007264c 100644 --- a/examples/examples-audiokit/player-sd_a2dp-audiokit/player-sd_a2dp-audiokit.ino +++ b/examples/examples-audiokit/player-sd_a2dp-audiokit/player-sd_a2dp-audiokit.ino @@ -13,14 +13,14 @@ #include "AudioTools.h" #include "AudioLibs/AudioA2DP.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/AudioSourceSDFAT.h" #include "AudioCodecs/CodecMP3Helix.h" const char *startFilePath="/"; const char* ext="mp3"; -AudioKitStream kit; -SdSpiConfig sdcfg(PIN_AUDIO_KIT_SD_CARD_CS, DEDICATED_SPI, SD_SCK_MHZ(10) , &AUDIOKIT_SD_SPI); +AudioBoardStream kit(AudioKitEs8388V1); +SdSpiConfig sdcfg(PIN_AUDIO_KIT_SD_CARD_CS, DEDICATED_SPI, SD_SCK_MHZ(10) , &SPI); AudioSourceSDFAT source(startFilePath, ext, sdcfg); MP3DecoderHelix decoder; AudioPlayer player(source, kit, decoder); @@ -68,7 +68,7 @@ void setup() { kit.begin(cfg); // setup additional buttons - kit.addAction(PIN_KEY4, mode); + kit.addAction(kit.getKey(4), mode); // setup player player.setVolume(0.7); diff --git a/examples/examples-audiokit/player-sdfat-audiokit/README.md b/examples/examples-audiokit/player-sdfat-audiokit/README.md index 95936b693..64ac89621 100644 --- a/examples/examples-audiokit/player-sdfat-audiokit/README.md +++ b/examples/examples-audiokit/player-sdfat-audiokit/README.md @@ -18,5 +18,5 @@ You need to install the following libraries: - https://github.com/pschatzmann/arduino-audio-tools - https://github.com/pschatzmann/arduino-libhelix -- https://github.com/pschatzmann/arduino-audiokit +- https://github.com/pschatzmann/arduino-audio-driver - https://github.com/greiman/SdFat diff --git a/examples/examples-audiokit/player-sdfat-audiokit/player-sdfat-audiokit.ino b/examples/examples-audiokit/player-sdfat-audiokit/player-sdfat-audiokit.ino index 59880f814..ce249f462 100644 --- a/examples/examples-audiokit/player-sdfat-audiokit/player-sdfat-audiokit.ino +++ b/examples/examples-audiokit/player-sdfat-audiokit/player-sdfat-audiokit.ino @@ -8,15 +8,15 @@ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/AudioSourceSDFAT.h" // or AudioSourceIdxSDFAT.h #include "AudioCodecs/CodecMP3Helix.h" const char *startFilePath="/"; const char* ext="mp3"; -SdSpiConfig sdcfg(PIN_AUDIO_KIT_SD_CARD_CS, DEDICATED_SPI, SD_SCK_MHZ(10) , &AUDIOKIT_SD_SPI); +SdSpiConfig sdcfg(PIN_AUDIO_KIT_SD_CARD_CS, DEDICATED_SPI, SD_SCK_MHZ(10) , &SPI); AudioSourceSDFAT source(startFilePath, ext, sdcfg); -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); MP3DecoderHelix decoder; // or change to MP3DecoderMAD AudioPlayer player(source, kit, decoder); @@ -41,9 +41,9 @@ void setup() { kit.begin(cfg); // setup additional buttons - kit.addAction(PIN_KEY1, startStop); - kit.addAction(PIN_KEY4, next); - kit.addAction(PIN_KEY3, previous); + kit.addAction(kit.getKey(1), startStop); + kit.addAction(kit.getKey(4), next); + kit.addAction(kit.getKey(3), previous); // setup player diff --git a/examples/examples-audiokit/player-sdmmc-audiokit/README.md b/examples/examples-audiokit/player-sdmmc-audiokit/README.md index 5baa0397a..85fc694fc 100644 --- a/examples/examples-audiokit/player-sdmmc-audiokit/README.md +++ b/examples/examples-audiokit/player-sdmmc-audiokit/README.md @@ -19,4 +19,4 @@ You need to install the following libraries: - https://github.com/pschatzmann/arduino-audio-tools - https://github.com/pschatzmann/arduino-libhelix -- https://github.com/pschatzmann/arduino-audiokit +- https://github.com/pschatzmann/arduino-audio-driver diff --git a/examples/examples-audiokit/player-sdmmc-audiokit/player-sdmmc-audiokit.ino b/examples/examples-audiokit/player-sdmmc-audiokit/player-sdmmc-audiokit.ino index 1639f2bd0..3e3c9ba5c 100644 --- a/examples/examples-audiokit/player-sdmmc-audiokit/player-sdmmc-audiokit.ino +++ b/examples/examples-audiokit/player-sdmmc-audiokit/player-sdmmc-audiokit.ino @@ -7,14 +7,14 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/AudioSourceSDMMC.h" // or AudioSourceIdxSDMMC.h #include "AudioCodecs/CodecMP3Helix.h" const char *startFilePath="/"; const char* ext="mp3"; AudioSourceSDMMC source(startFilePath, ext); -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); MP3DecoderHelix decoder; // or change to MP3DecoderMAD AudioPlayer player(source, kit, decoder); diff --git a/examples/examples-audiokit/player-url_icy-audiokit/README.md b/examples/examples-audiokit/player-url_icy-audiokit/README.md index bef056ac6..1e5bb0e59 100644 --- a/examples/examples-audiokit/player-url_icy-audiokit/README.md +++ b/examples/examples-audiokit/player-url_icy-audiokit/README.md @@ -18,4 +18,4 @@ I also demonstrate how to assign your own actions to the buttons of the audio ki - https://github.com/pschatzmann/arduino-audio-tools - https://github.com/pschatzmann/arduino-libhelix -- https://github.com/pschatzmann/arduino-audiokit +- https://github.com/pschatzmann/arduino-audio-driver diff --git a/examples/examples-audiokit/player-url_icy-audiokit/player-url_icy-audiokit.ino b/examples/examples-audiokit/player-url_icy-audiokit/player-url_icy-audiokit.ino index 579a22782..6d14bc9e8 100644 --- a/examples/examples-audiokit/player-url_icy-audiokit/player-url_icy-audiokit.ino +++ b/examples/examples-audiokit/player-url_icy-audiokit/player-url_icy-audiokit.ino @@ -8,7 +8,7 @@ #include "AudioTools.h" #include "AudioCodecs/CodecMP3Helix.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" const char *urls[] = { "http://stream.srg-ssr.ch/m/rsj/mp3_128", @@ -22,7 +22,7 @@ const char *password = "password"; ICYStream urlStream(wifi, password); AudioSourceURL source(urlStream, urls, "audio/mp3"); -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); MP3DecoderHelix decoder; AudioPlayer player(source, kit, decoder); @@ -53,8 +53,8 @@ void setup() { kit.begin(cfg); // setup navigation - kit.addAction(PIN_KEY4, next); - kit.addAction(PIN_KEY3, previous); + kit.addAction(kit.getKey(4), next); + kit.addAction(kit.getKey(3), previous); // setup player player.setVolume(0.7); diff --git a/examples/examples-audiokit/stream-hls-audiokit/stream-hls-audiokit.ino b/examples/examples-audiokit/stream-hls-audiokit/stream-hls-audiokit.ino index 914641123..d9595ee94 100644 --- a/examples/examples-audiokit/stream-hls-audiokit/stream-hls-audiokit.ino +++ b/examples/examples-audiokit/stream-hls-audiokit/stream-hls-audiokit.ino @@ -14,10 +14,10 @@ #include "AudioCodecs/CodecMTS.h" #include "AudioCodecs/CodecADTS.h" #include "AudioCodecs/CodecAACHelix.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" -AudioKitStream out; // final output of decoded stream +AudioBoardStream out(AudioKitEs8388V1);// final output of decoded stream HLSStream hls_stream("SSID", "password"); MTSDecoder mts; ADTSDecoder adts; diff --git a/examples/examples-audiokit/streams-a2dp-audiokit/streams-a2dp-audiokit.ino b/examples/examples-audiokit/streams-a2dp-audiokit/streams-a2dp-audiokit.ino index f15ce732f..dce0842d7 100644 --- a/examples/examples-audiokit/streams-a2dp-audiokit/streams-a2dp-audiokit.ino +++ b/examples/examples-audiokit/streams-a2dp-audiokit/streams-a2dp-audiokit.ino @@ -10,11 +10,11 @@ #include "AudioTools.h" #include "AudioLibs/AudioA2DP.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" A2DPStream in; -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); StreamCopy copier(kit, in); // copy in to out // Arduino Setup diff --git a/examples/examples-audiokit/streams-audiokit-audiokit/README.md b/examples/examples-audiokit/streams-audiokit-audiokit/README.md index 3f8e9c24b..e01ffbb34 100644 --- a/examples/examples-audiokit/streams-audiokit-audiokit/README.md +++ b/examples/examples-audiokit/streams-audiokit-audiokit/README.md @@ -12,4 +12,4 @@ We implement a AudioKit source and sink: We stream the sound input which we read You need to install the following libraries: - https://github.com/pschatzmann/arduino-audio-tools -- https://github.com/pschatzmann/arduino-audiokit +- https://github.com/pschatzmann/arduino-audio-driver diff --git a/examples/examples-audiokit/streams-audiokit-audiokit/streams-audiokit-audiokit.ino b/examples/examples-audiokit/streams-audiokit-audiokit/streams-audiokit-audiokit.ino index eb14a1777..5646147db 100644 --- a/examples/examples-audiokit/streams-audiokit-audiokit/streams-audiokit-audiokit.ino +++ b/examples/examples-audiokit/streams-audiokit-audiokit/streams-audiokit-audiokit.ino @@ -9,9 +9,9 @@ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" -AudioKitStream kit; // Access I2S as stream +AudioBoardStream kit(AudioKitEs8388V1); // Access I2S as stream StreamCopy copier(kit, kit); // copy kit to kit // Arduino Setup @@ -21,7 +21,7 @@ void setup(void) { auto cfg = kit.defaultConfig(RXTX_MODE); cfg.sd_active = false; - cfg.input_device = AUDIO_HAL_ADC_INPUT_LINE2; + cfg.input_device = ADC_INPUT_LINE2; kit.begin(cfg); } diff --git a/examples/examples-audiokit/streams-audiokit-effects-audiokit/streams-audiokit-effects-audiokit.ino b/examples/examples-audiokit/streams-audiokit-effects-audiokit/streams-audiokit-effects-audiokit.ino index 9519adcf6..12f846c2e 100644 --- a/examples/examples-audiokit/streams-audiokit-effects-audiokit/streams-audiokit-effects-audiokit.ino +++ b/examples/examples-audiokit/streams-audiokit-effects-audiokit/streams-audiokit-effects-audiokit.ino @@ -11,7 +11,7 @@ #include // https://arduinojson.org/ #include "HttpServer.h" // https://github.com/pschatzmann/TinyHttp #include "AudioTools.h" // https://github.com/pschatzmann/arduino-audio-tools.git -#include "AudioLibs/AudioKit.h" // https://github.com/pschatzmann/arduino-audiokit.git +#include "AudioLibs/AudioBoardStream.h" // https://github.com/pschatzmann/arduino-audio-driver.git // Server WiFiServer wifi; @@ -39,7 +39,7 @@ Fuzz fuzz(fuzzEffectValue); Tremolo tremolo(tremoloDuration, tremoloDepth, sample_rate); // Audio -AudioKitStream kit; // Access I2S as stream +AudioBoardStream kit(AudioKitEs8388V1); // Access I2S as stream AudioEffectStream effects(kit); // input from kit StreamCopy copier(kit, effects); // copy effects to kit @@ -131,7 +131,7 @@ void setup(void) { // Setup Kit auto cfg = kit.defaultConfig(RXTX_MODE); cfg.sd_active = false; - cfg.input_device = AUDIO_HAL_ADC_INPUT_LINE2; + cfg.input_device = ADC_INPUT_LINE2; cfg.sample_rate = sample_rate; cfg.channels = channels; // minimize lag diff --git a/examples/examples-audiokit/streams-audiokit-fft-led/streams-audiokit-fft-led.ino b/examples/examples-audiokit/streams-audiokit-fft-led/streams-audiokit-fft-led.ino index 468d8080e..428b19538 100644 --- a/examples/examples-audiokit/streams-audiokit-fft-led/streams-audiokit-fft-led.ino +++ b/examples/examples-audiokit/streams-audiokit-fft-led/streams-audiokit-fft-led.ino @@ -10,7 +10,7 @@ * */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/AudioRealFFT.h" // or AudioKissFFT #include "AudioLibs/LEDOutput.h" @@ -18,7 +18,7 @@ #define LED_X 32 #define LED_Y 8 -AudioKitStream kit; // Audio source +AudioBoardStream kit(AudioKitEs8388V1); // Audio source AudioRealFFT fft; // or AudioKissFFT FFTDisplay fft_dis(fft); LEDOutput led(fft_dis); // output to LED matrix @@ -30,7 +30,7 @@ void setup() { // setup Audiokit as input device auto cfg = kit.defaultConfig(RX_MODE); - cfg.input_device = AUDIO_HAL_ADC_INPUT_LINE2; + cfg.input_device = ADC_INPUT_LINE2; kit.begin(cfg); // Setup FFT output diff --git a/examples/examples-audiokit/streams-audiokit-fft/README.md b/examples/examples-audiokit/streams-audiokit-fft/README.md index d2a042067..275bf8b33 100644 --- a/examples/examples-audiokit/streams-audiokit-fft/README.md +++ b/examples/examples-audiokit/streams-audiokit-fft/README.md @@ -18,4 +18,4 @@ The log level has been set to Info to help you to identify any problems. Please You need to install the following libraries: - https://github.com/pschatzmann/arduino-audio-tools -- https://github.com/pschatzmann/arduino-audiokit +- https://github.com/pschatzmann/arduino-audio-driver diff --git a/examples/examples-audiokit/streams-audiokit-fft/streams-audiokit-fft.ino b/examples/examples-audiokit/streams-audiokit-fft/streams-audiokit-fft.ino index 50bf3e811..707415593 100644 --- a/examples/examples-audiokit/streams-audiokit-fft/streams-audiokit-fft.ino +++ b/examples/examples-audiokit/streams-audiokit-fft/streams-audiokit-fft.ino @@ -1,9 +1,9 @@ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/AudioRealFFT.h" // or AudioKissFFT -AudioKitStream kit; // Audio source +AudioBoardStream kit(AudioKitEs8388V1); // Audio source AudioRealFFT fft; // or AudioKissFFT StreamCopy copier(fft, kit); // copy mic to tfl int channels = 2; @@ -32,7 +32,7 @@ void setup() { // setup Audiokit auto cfg = kit.defaultConfig(RX_MODE); - cfg.input_device = AUDIO_HAL_ADC_INPUT_LINE2; + cfg.input_device = ADC_INPUT_LINE2; cfg.channels = channels; cfg.sample_rate = samples_per_second; cfg.bits_per_sample = bits_per_sample; diff --git a/examples/examples-audiokit/streams-audiokit-filter-audiokit/streams-audiokit-filter-audiokit.ino b/examples/examples-audiokit/streams-audiokit-filter-audiokit/streams-audiokit-filter-audiokit.ino index 0c0cc8f7f..1d5a29da5 100644 --- a/examples/examples-audiokit/streams-audiokit-filter-audiokit/streams-audiokit-filter-audiokit.ino +++ b/examples/examples-audiokit/streams-audiokit-filter-audiokit/streams-audiokit-filter-audiokit.ino @@ -6,10 +6,10 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(44100, 2, 16); -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); // copy filtered values FilteredStream filtered(kit, info.channels); // Defiles the filter as BaseConverter @@ -34,7 +34,7 @@ void setup(void) { auto config = kit.defaultConfig(RXTX_MODE); config.copyFrom(info); config.sd_active = false; - config.input_device = AUDIO_HAL_ADC_INPUT_LINE2; + config.input_device = ADC_INPUT_LINE2; kit.begin(config); Serial.println("KIT started..."); diff --git a/examples/examples-audiokit/streams-audiokit-multioutput-server/streams-audiokit-multioutput-server.ino b/examples/examples-audiokit/streams-audiokit-multioutput-server/streams-audiokit-multioutput-server.ino index a2f3e2e5b..95c607921 100644 --- a/examples/examples-audiokit/streams-audiokit-multioutput-server/streams-audiokit-multioutput-server.ino +++ b/examples/examples-audiokit/streams-audiokit-multioutput-server/streams-audiokit-multioutput-server.ino @@ -10,11 +10,11 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" const int buffer_count = 10; const int buffer_size = 1024; -AudioKitStream kit; // input & output +AudioBoardStream kit(AudioKitEs8388V1); // input & output QueueStream queue(buffer_size, buffer_count, true); AudioEncoderServer server(new WAVEncoder(),"WIFI","password"); MultiOutput out(queue, kit); @@ -28,7 +28,7 @@ void setup(void) { // setup audiokit auto cfg = kit.defaultConfig(RXTX_MODE); cfg.sd_active = false; - cfg.input_device = AUDIO_HAL_ADC_INPUT_LINE2; // input from microphone + cfg.input_device = ADC_INPUT_LINE2; // input from microphone cfg.sample_rate = 16000; kit.setVolume(0.5); kit.begin(cfg); diff --git a/examples/examples-audiokit/streams-audiokit-multioutput/streams-audiokit-multioutput.ino b/examples/examples-audiokit/streams-audiokit-multioutput/streams-audiokit-multioutput.ino index abb0b2fc7..65583d52b 100644 --- a/examples/examples-audiokit/streams-audiokit-multioutput/streams-audiokit-multioutput.ino +++ b/examples/examples-audiokit/streams-audiokit-multioutput/streams-audiokit-multioutput.ino @@ -10,10 +10,10 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(8000, 2, 16); -AudioKitStream kit; // Access I2S as stream +AudioBoardStream kit(AudioKitEs8388V1); // Access I2S as stream CsvOutput csv(Serial); MultiOutput out; StreamCopy copier(out, kit); // copy kit to kit @@ -29,7 +29,7 @@ void setup(void) { auto cfg = kit.defaultConfig(RXTX_MODE); cfg.copyFrom(info); cfg.sd_active = false; - cfg.input_device = AUDIO_HAL_ADC_INPUT_LINE2; // input from microphone + cfg.input_device = ADC_INPUT_LINE2; // input from microphone kit.setVolume(0.5); kit.begin(cfg); diff --git a/examples/examples-audiokit/streams-audiokit-ram-audiokit/streams-audiokit-ram-audiokit.ino b/examples/examples-audiokit/streams-audiokit-ram-audiokit/streams-audiokit-ram-audiokit.ino index c0d4cf86f..9cb301a5b 100644 --- a/examples/examples-audiokit/streams-audiokit-ram-audiokit/streams-audiokit-ram-audiokit.ino +++ b/examples/examples-audiokit/streams-audiokit-ram-audiokit/streams-audiokit-ram-audiokit.ino @@ -10,11 +10,11 @@ * */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/MemoryManager.h" AudioInfo info(16000, 1, 16); -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); MemoryManager memory(500); // Activate SPI RAM for objects > 500 bytes DynamicMemoryStream recording(true); // Audio stored on heap StreamCopy copier; // copies data @@ -46,12 +46,12 @@ void setup(){ auto cfg = kit.defaultConfig(RXTX_MODE); cfg.sd_active = true; cfg.copyFrom(info); - cfg.input_device = AUDIO_HAL_ADC_INPUT_LINE2; + cfg.input_device = ADC_INPUT_LINE2; kit.begin(cfg); kit.setVolume(1.0); // record when key 1 is pressed - kit.audioActions().add(PIN_KEY1, record_start, record_end); + kit.audioActions().add(kit.getKey(1), record_start, record_end); Serial.println("Press Key 1 to record"); } diff --git a/examples/examples-audiokit/streams-audiokit-ram-ptichshift-audiokit/streams-audiokit-ram-ptichshift-audiokit.ino b/examples/examples-audiokit/streams-audiokit-ram-ptichshift-audiokit/streams-audiokit-ram-ptichshift-audiokit.ino index 008f7b24a..695b54970 100644 --- a/examples/examples-audiokit/streams-audiokit-ram-ptichshift-audiokit/streams-audiokit-ram-ptichshift-audiokit.ino +++ b/examples/examples-audiokit/streams-audiokit-ram-ptichshift-audiokit/streams-audiokit-ram-ptichshift-audiokit.ino @@ -11,12 +11,12 @@ * */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/MemoryManager.h" AudioInfo info(16000, 1, 16); MemoryManager memory(500); // Activate SPI RAM for objects > 500 bytes -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); //use one of VariableSpeedRingBufferSimple, VariableSpeedRingBuffer, VariableSpeedRingBuffer180 PitchShiftOutput> pitch_shift(kit); DynamicMemoryStream recording(false); // Audio stored on heap, non repeating @@ -50,7 +50,7 @@ void setup(){ auto cfg = kit.defaultConfig(RXTX_MODE); cfg.sd_active = true; cfg.copyFrom(info); - cfg.input_device = AUDIO_HAL_ADC_INPUT_LINE2; + cfg.input_device = ADC_INPUT_LINE2; kit.begin(cfg); kit.setVolume(1.0); @@ -62,7 +62,7 @@ void setup(){ pitch_shift.begin(cfg_pc); // record when key 1 is pressed - kit.audioActions().add(PIN_KEY1, record_start, record_end); + kit.audioActions().add(kit.getKey(1), record_start, record_end); Serial.println("Press Key 1 to record"); } diff --git a/examples/examples-audiokit/streams-audiokit-sd-audiokit/streams-audiokit-sd-audiokit.ino b/examples/examples-audiokit/streams-audiokit-sd-audiokit/streams-audiokit-sd-audiokit.ino index 97dea3364..0b093d799 100644 --- a/examples/examples-audiokit/streams-audiokit-sd-audiokit/streams-audiokit-sd-audiokit.ino +++ b/examples/examples-audiokit/streams-audiokit-sd-audiokit/streams-audiokit-sd-audiokit.ino @@ -10,13 +10,13 @@ * */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include #include const char *file_name = "/rec.raw"; AudioInfo info(16000, 1, 16); -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); File file; // final output stream StreamCopy copier; // copies data bool recording = false; // flag to make sure that close is only executed one @@ -50,7 +50,7 @@ void setup(){ auto cfg = kit.defaultConfig(RXTX_MODE); cfg.sd_active = true; cfg.copyFrom(info); - cfg.input_device = AUDIO_HAL_ADC_INPUT_LINE2; + cfg.input_device = ADC_INPUT_LINE2; kit.begin(cfg); kit.setVolume(1.0); @@ -63,7 +63,7 @@ void setup(){ // record when key 1 is pressed - kit.audioActions().add(PIN_KEY1, record_start, record_end); + kit.audioActions().add(kit.getKey(1), record_start, record_end); Serial.println("Press Key 1 to record"); } diff --git a/examples/examples-audiokit/streams-audiokit-sd_wav/streams-audiokit-sd_wav.ino b/examples/examples-audiokit/streams-audiokit-sd_wav/streams-audiokit-sd_wav.ino index c415ae2dc..23755f39f 100644 --- a/examples/examples-audiokit/streams-audiokit-sd_wav/streams-audiokit-sd_wav.ino +++ b/examples/examples-audiokit/streams-audiokit-sd_wav/streams-audiokit-sd_wav.ino @@ -13,11 +13,11 @@ #include #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" const char* file_name = "/rec.wav"; AudioInfo info(16000, 1, 16); -AudioKitStream in; +AudioBoardStream in(AudioKitEs8388V1); File file; // final output stream EncodedAudioStream out(&file, new WAVEncoder()); StreamCopy copier(out, in); // copies data @@ -32,7 +32,7 @@ void setup() { auto cfg = in.defaultConfig(RX_MODE); cfg.sd_active = true; cfg.copyFrom(info); - cfg.input_device = AUDIO_HAL_ADC_INPUT_LINE2; // microphone + cfg.input_device = ADC_INPUT_LINE2; // microphone in.begin(cfg); // Open SD drive diff --git a/examples/examples-audiokit/streams-audiokit-serial/README.md b/examples/examples-audiokit/streams-audiokit-serial/README.md index 93eff73a8..10a2da300 100644 --- a/examples/examples-audiokit/streams-audiokit-serial/README.md +++ b/examples/examples-audiokit/streams-audiokit-serial/README.md @@ -12,4 +12,4 @@ We implement a AudioKit source: We stream the sound input which we read in from You need to install the following libraries: - https://github.com/pschatzmann/arduino-audio-tools -- https://github.com/pschatzmann/arduino-audiokit +- https://github.com/pschatzmann/arduino-audio-driver diff --git a/examples/examples-audiokit/streams-audiokit-serial/streams-audiokit-serial.ino b/examples/examples-audiokit/streams-audiokit-serial/streams-audiokit-serial.ino index 0bef6a39a..e274c3e7b 100644 --- a/examples/examples-audiokit/streams-audiokit-serial/streams-audiokit-serial.ino +++ b/examples/examples-audiokit/streams-audiokit-serial/streams-audiokit-serial.ino @@ -9,10 +9,10 @@ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(44100, 2, 16); -AudioKitStream kit; // Access I2S as stream +AudioBoardStream kit(AudioKitEs8388V1); // Access I2S as stream CsvOutput csvStream(Serial); StreamCopy copier(csvStream, kit); // copy kit to csvStream @@ -23,7 +23,7 @@ void setup(void) { auto cfg = kit.defaultConfig(RX_MODE); cfg.copyFrom(info); - cfg.input_device = AUDIO_HAL_ADC_INPUT_LINE2; + cfg.input_device = ADC_INPUT_LINE2; kit.begin(cfg); // make sure that we have the correct channels set up diff --git a/examples/examples-audiokit/streams-audiokit-tf/README.md b/examples/examples-audiokit/streams-audiokit-tf/README.md index 3b25ab4bc..80157a08f 100644 --- a/examples/examples-audiokit/streams-audiokit-tf/README.md +++ b/examples/examples-audiokit/streams-audiokit-tf/README.md @@ -22,5 +22,5 @@ The log level has been set to Info to help you to identify any problems. Please You need to install the following libraries: - https://github.com/pschatzmann/arduino-audio-tools -- https://github.com/pschatzmann/arduino-audiokit +- https://github.com/pschatzmann/arduino-audio-driver - https://github.com/pschatzmann/tflite-micro-arduino-examples \ No newline at end of file diff --git a/examples/examples-audiokit/streams-audiokit-tf/streams-audiokit-tf.ino b/examples/examples-audiokit/streams-audiokit-tf/streams-audiokit-tf.ino index 8cc39d8dd..df0432fd0 100644 --- a/examples/examples-audiokit/streams-audiokit-tf/streams-audiokit-tf.ino +++ b/examples/examples-audiokit/streams-audiokit-tf/streams-audiokit-tf.ino @@ -1,10 +1,10 @@ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/TfLiteAudioStream.h" #include "model.h" // tensorflow model -AudioKitStream kit; // Audio source +AudioBoardStream kit(AudioKitEs8388V1); // Audio source TfLiteAudioStream tfl; // Audio sink const char* kCategoryLabels[4] = { "silence", @@ -32,7 +32,7 @@ void setup() { // setup Audiokit auto cfg = kit.defaultConfig(RX_MODE); - cfg.input_device = AUDIO_HAL_ADC_INPUT_LINE2; + cfg.input_device = ADC_INPUT_LINE2; cfg.channels = channels; cfg.sample_rate = samples_per_second; cfg.use_apll = false; diff --git a/examples/examples-audiokit/streams-audiokit-webserver_aac/streams-audiokit-webserver_aac.ino b/examples/examples-audiokit/streams-audiokit-webserver_aac/streams-audiokit-webserver_aac.ino index f282174fb..d69f4a943 100644 --- a/examples/examples-audiokit/streams-audiokit-webserver_aac/streams-audiokit-webserver_aac.ino +++ b/examples/examples-audiokit/streams-audiokit-webserver_aac/streams-audiokit-webserver_aac.ino @@ -8,10 +8,10 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioCodecs/CodecAACFDK.h" -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); AACEncoderFDK *fdk=nullptr; AudioEncoderServer *server=nullptr; @@ -33,12 +33,11 @@ void setup(){ // start i2s input with default configuration Serial.println("starting AudioKit..."); auto config = kit.defaultConfig(RX_MODE); - config.input_device = AUDIO_HAL_ADC_INPUT_LINE2; + config.input_device = ADC_INPUT_LINE2; config.sample_rate = 44100; - config.default_actions_active = false; config.channels = 2; config.sd_active = false; - kit.begin(config); + kit.begin(config, false); Serial.println("AudioKit started"); // start data sink diff --git a/examples/examples-audiokit/streams-audiokit-webserver_wav/streams-audiokit-webserver_wav.ino b/examples/examples-audiokit/streams-audiokit-webserver_wav/streams-audiokit-webserver_wav.ino index 3868d22f7..7aca63188 100644 --- a/examples/examples-audiokit/streams-audiokit-webserver_wav/streams-audiokit-webserver_wav.ino +++ b/examples/examples-audiokit/streams-audiokit-webserver_wav/streams-audiokit-webserver_wav.ino @@ -8,10 +8,10 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioEncoderServer server(new WAVEncoder(),"ssid","password"); -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); // Arduino setup void setup(){ @@ -21,7 +21,7 @@ void setup(){ // start i2s input with default configuration Serial.println("starting AudioKit..."); auto config = kit.defaultConfig(RX_MODE); - config.input_device = AUDIO_HAL_ADC_INPUT_LINE1; + config.input_device = ADC_INPUT_LINE1; config.sample_rate = 44100; config.sd_active = false; kit.begin(config); diff --git a/examples/examples-audiokit/streams-file_loop-audiokit/streams-file_loop-audiokit.ino b/examples/examples-audiokit/streams-file_loop-audiokit/streams-file_loop-audiokit.ino index a0324f744..031993b4c 100644 --- a/examples/examples-audiokit/streams-file_loop-audiokit/streams-file_loop-audiokit.ino +++ b/examples/examples-audiokit/streams-file_loop-audiokit/streams-file_loop-audiokit.ino @@ -11,13 +11,13 @@ #include #include #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/FileLoop.h" #include "AudioCodecs/CodecMP3Helix.h" const int chipSelect=PIN_AUDIO_KIT_SD_CARD_CS; -AudioKitStream i2s; // final output of decoded stream +AudioBoardStream i2s(AudioKitEs8388V1); // final output of decoded stream EncodedAudioStream decoder(&i2s, new MP3DecoderHelix()); // Decoding stream FileLoop loopingFile; StreamCopy copier(decoder, loopingFile); diff --git a/examples/examples-audiokit/streams-generator-audiokit/streams-generator-audiokit.ino b/examples/examples-audiokit/streams-generator-audiokit/streams-generator-audiokit.ino index eeb713e28..749aec1ef 100644 --- a/examples/examples-audiokit/streams-generator-audiokit/streams-generator-audiokit.ino +++ b/examples/examples-audiokit/streams-generator-audiokit/streams-generator-audiokit.ino @@ -6,12 +6,12 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(32000, 2, 16); SineWaveGenerator sineWave(32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound(sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); StreamCopy copier(out, sound); // copies sound into i2s // Arduino Setup diff --git a/examples/examples-audiokit/streams-generator_fromarray-audiokit/streams-generator_fromarray-audiokit.ino b/examples/examples-audiokit/streams-generator_fromarray-audiokit/streams-generator_fromarray-audiokit.ino index 71b0afced..eefdea7ba 100644 --- a/examples/examples-audiokit/streams-generator_fromarray-audiokit/streams-generator_fromarray-audiokit.ino +++ b/examples/examples-audiokit/streams-generator_fromarray-audiokit/streams-generator_fromarray-audiokit.ino @@ -6,13 +6,13 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(44100, 2, 16); int16_t sine_array[] = {0, 2285, 4560, 6812, 9031, 11206, 13327, 15383, 17363, 19259, 21062, 22761, 24350, 25820, 27165, 28377, 29450, 30381, 31163, 31793, 32269, 32587, 32747, 32747, 32587, 32269, 31793, 31163, 30381, 29450, 28377, 27165, 25820, 24350, 22761, 21062, 19259, 17363, 15383, 13327, 11206, 9031, 6812, 4560, 2285, 0, -2285, -4560, -6812, -9031, -11206, -13327, -15383, -17363, -19259, -21062, -22761, -24350, -25820, -27165, -28377, -29450, -30381, -31163, -31793, -32269, -32587, -32747, -32747, -32587, -32269, -31793, -31163, -30381, -29450, -28377, -27165, -25820, -24350, -22761, -21062, -19259, -17363, -15383, -13327, -11206, -9031, -6812, -4560, -2285 }; GeneratorFromArray sineWave(sine_array,0,false); GeneratedSoundStream sound(sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); StreamCopy copier(out, sound); // copies sound into i2s diff --git a/examples/examples-audiokit/streams-generator_inputmixer-audiokit/streams-generator_inputmixer-audiokit.ino b/examples/examples-audiokit/streams-generator_inputmixer-audiokit/streams-generator_inputmixer-audiokit.ino index 080a4dca4..f1eb89e5c 100644 --- a/examples/examples-audiokit/streams-generator_inputmixer-audiokit/streams-generator_inputmixer-audiokit.ino +++ b/examples/examples-audiokit/streams-generator_inputmixer-audiokit/streams-generator_inputmixer-audiokit.ino @@ -6,7 +6,7 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(32000, 2, 16); SineWaveGenerator sineWave1(32000); // subclass of SoundGenerator with max amplitude of 32000 @@ -14,7 +14,7 @@ SineWaveGenerator sineWave2(32000); // subclass of Sound GeneratedSoundStream sound1(sineWave1); // Stream generated from sine wave GeneratedSoundStream sound2(sineWave2); // Stream generated from sine wave InputMixer mixer; -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); StreamCopy copier(out, mixer); // copies sound into i2s // Arduino Setup diff --git a/examples/examples-audiokit/streams-generator_outputmixer-audiokit/streams-generator_outputmixer-audiokit.ino b/examples/examples-audiokit/streams-generator_outputmixer-audiokit/streams-generator_outputmixer-audiokit.ino index 94ad44365..95d306584 100644 --- a/examples/examples-audiokit/streams-generator_outputmixer-audiokit/streams-generator_outputmixer-audiokit.ino +++ b/examples/examples-audiokit/streams-generator_outputmixer-audiokit/streams-generator_outputmixer-audiokit.ino @@ -6,15 +6,15 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(32000, 2, 16); SineWaveGenerator sineWave1(32000); // subclass of SoundGenerator with max amplitude of 32000 SineWaveGenerator sineWave2(32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound1(sineWave1); // Stream generated from sine wave GeneratedSoundStream sound2(sineWave2); // Stream generated from sine wave -AudioKitStream out; -OutputMixer mixer(out, 2); // output mixer with 2 outputs mixing to AudioKitStream +AudioBoardStream out(AudioKitEs8388V1); +OutputMixer mixer(out, 2); // output mixer with 2 outputs mixing to AudioBoardStream StreamCopy copier1(mixer, sound1); // copies sound into mixer StreamCopy copier2(mixer, sound2); // copies sound into mixer diff --git a/examples/examples-audiokit/streams-generator_sinfromtable-audiokit/streams-generator_sinfromtable-audiokit.ino b/examples/examples-audiokit/streams-generator_sinfromtable-audiokit/streams-generator_sinfromtable-audiokit.ino index e0720fa08..da85b56e4 100644 --- a/examples/examples-audiokit/streams-generator_sinfromtable-audiokit/streams-generator_sinfromtable-audiokit.ino +++ b/examples/examples-audiokit/streams-generator_sinfromtable-audiokit/streams-generator_sinfromtable-audiokit.ino @@ -6,12 +6,12 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(32000, 2, 16); SineFromTable sineWave(32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound(sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); //CsvOutput out(Serial); int sound_len=1024; StreamCopy copier(out, sound, sound_len); // copies sound into i2s diff --git a/examples/examples-audiokit/streams-memory_mp3-audiokit/streams-memory_mp3-audiokit.ino b/examples/examples-audiokit/streams-memory_mp3-audiokit/streams-memory_mp3-audiokit.ino index 6d9769635..8ff7eb7ee 100644 --- a/examples/examples-audiokit/streams-memory_mp3-audiokit/streams-memory_mp3-audiokit.ino +++ b/examples/examples-audiokit/streams-memory_mp3-audiokit/streams-memory_mp3-audiokit.ino @@ -11,11 +11,11 @@ #include "AudioTools.h" #include "AudioCodecs/CodecMP3Helix.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "zero.h" MemoryStream mp3(zero_mp3, zero_mp3_len); -AudioKitStream i2s; +AudioBoardStream i2s(AudioKitEs8388V1); MP3DecoderHelix helix; EncodedAudioStream out(&i2s, &helix); // output to decoder StreamCopy copier(out, mp3); // copy in to i2s diff --git a/examples/examples-audiokit/streams-memory_pcm-mixer-audiokit/streams-memory_pcm-mixer-audiokit.ino b/examples/examples-audiokit/streams-memory_pcm-mixer-audiokit/streams-memory_pcm-mixer-audiokit.ino index d492b640f..6ffb13980 100644 --- a/examples/examples-audiokit/streams-memory_pcm-mixer-audiokit/streams-memory_pcm-mixer-audiokit.ino +++ b/examples/examples-audiokit/streams-memory_pcm-mixer-audiokit/streams-memory_pcm-mixer-audiokit.ino @@ -9,12 +9,12 @@ * */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "drums.h" #include "guitar.h" InputMixer mixer; -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); MemoryStream drums(drums_raw, drums_raw_len); MemoryStream guitar(guitar_raw, guitar_raw_len); StreamCopy copier(kit, mixer); diff --git a/examples/examples-audiokit/streams-pins-audiokit/README.md b/examples/examples-audiokit/streams-pins-audiokit/README.md index f8097ca8e..d4afb8895 100644 --- a/examples/examples-audiokit/streams-pins-audiokit/README.md +++ b/examples/examples-audiokit/streams-pins-audiokit/README.md @@ -13,6 +13,6 @@ You just need to define you __handler methods__ (button1, button2...) and assign You need to install the following libraries: - [Arduino Audio Tools](https://github.com/pschatzmann/arduino-audio-tools) -- [AudioKit](https://github.com/pschatzmann/arduino-audiokit) +- [Audio Driver](https://github.com/pschatzmann/arduino-audio-driver) - [FLITE](https://github.com/pschatzmann/arduino-flite) diff --git a/examples/examples-audiokit/streams-pins-audiokit/streams-pins-audiokit.ino b/examples/examples-audiokit/streams-pins-audiokit/streams-pins-audiokit.ino index 7ec8e1ec6..ea5583191 100644 --- a/examples/examples-audiokit/streams-pins-audiokit/streams-pins-audiokit.ino +++ b/examples/examples-audiokit/streams-pins-audiokit/streams-pins-audiokit.ino @@ -7,10 +7,10 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "flite_arduino.h" -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); Flite flite(kit); void button1(bool, int, void*) { flite.say("Button One"); } @@ -32,16 +32,16 @@ void setup() { kit.begin(cfg); // Assign pins to methods - kit.addAction(PIN_KEY1, button1); - kit.addAction(PIN_KEY2, button2); - kit.addAction(PIN_KEY3, button3); - kit.addAction(PIN_KEY4, button4); + kit.addAction(kit.getKey(1), button1); + kit.addAction(kit.getKey(2), button2); + kit.addAction(kit.getKey(3), button3); + kit.addAction(kit.getKey(4), button4); // example with actions using lambda expression - auto down = [](bool,int,void*) { AudioKitStream::actionVolumeDown(true, -1, nullptr); flite.say("Volume down"); }; - kit.addAction(PIN_KEY5, down); - auto up = [](bool,int,void*) { AudioKitStream::actionVolumeUp(true, -1, nullptr ); flite.say("Volume up"); }; - kit.addAction(PIN_KEY6, up); + auto down = [](bool,int,void*) { AudioBoardStream::actionVolumeDown(true, -1, nullptr); flite.say("Volume down"); }; + kit.addAction(kit.getKey(5), down); + auto up = [](bool,int,void*) { AudioBoardStream::actionVolumeUp(true, -1, nullptr ); flite.say("Volume up"); }; + kit.addAction(kit.getKey(6), up); flite.say("Please push a button"); } diff --git a/examples/examples-audiokit/streams-sd-audiokit/streams-sd-audiokit.ino b/examples/examples-audiokit/streams-sd-audiokit/streams-sd-audiokit.ino index 27b39f39a..4a74b59f4 100644 --- a/examples/examples-audiokit/streams-sd-audiokit/streams-sd-audiokit.ino +++ b/examples/examples-audiokit/streams-sd-audiokit/streams-sd-audiokit.ino @@ -11,12 +11,12 @@ #include #include #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioCodecs/CodecMP3Helix.h" const int chipSelect=PIN_AUDIO_KIT_SD_CARD_CS; -AudioKitStream i2s; // final output of decoded stream +AudioBoardStream i2s(AudioKitEs8388V1); // final output of decoded stream EncodedAudioStream decoder(&i2s, new MP3DecoderHelix()); // Decoding stream StreamCopy copier; File audioFile; diff --git a/examples/examples-audiokit/streams-sdmmc_wav-audiokit/streams-sdmmc_wav-audiokit.ino b/examples/examples-audiokit/streams-sdmmc_wav-audiokit/streams-sdmmc_wav-audiokit.ino index 5c0ef1624..126909e97 100644 --- a/examples/examples-audiokit/streams-sdmmc_wav-audiokit/streams-sdmmc_wav-audiokit.ino +++ b/examples/examples-audiokit/streams-sdmmc_wav-audiokit/streams-sdmmc_wav-audiokit.ino @@ -11,9 +11,9 @@ #include "FS.h" #include "SD_MMC.h" #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" -AudioKitStream i2s; +AudioBoardStream i2s(AudioKitEs8388V1); WAVDecoder wav; EncodedAudioStream encoded(&i2s, &wav); // Decoding stream File audioFile; diff --git a/examples/examples-audiokit/streams-synth-a2dp/streams-synth-a2dp.ino b/examples/examples-audiokit/streams-synth-a2dp/streams-synth-a2dp.ino index 73e5f8086..cf3295c86 100644 --- a/examples/examples-audiokit/streams-synth-a2dp/streams-synth-a2dp.ino +++ b/examples/examples-audiokit/streams-synth-a2dp/streams-synth-a2dp.ino @@ -8,15 +8,15 @@ #define USE_MIDI #include "BluetoothA2DPSource.h" #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" BluetoothA2DPSource a2dp_source; int channels = 2; -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); Synthesizer synthesizer; GeneratedSoundStream in(synthesizer); -SynthesizerKey keys[] = {{PIN_KEY1, N_C3},{PIN_KEY2, N_D3},{PIN_KEY3, N_E3},{PIN_KEY4, N_F3},{PIN_KEY5, N_G3},{PIN_KEY6, N_A3},{0,0}}; +SynthesizerKey keys[] = {{kit.getKey(1), N_C3},{kit.getKey(2), N_D3},{kit.getKey(3), N_E3},{kit.getKey(4), N_F3},{kit.getKey(5), N_G3},{kit.getKey(6), N_A3},{0,0}}; int32_t get_sound_data(Frame *data, int32_t frameCount) { int frame_size = sizeof(int16_t)*channels; @@ -39,8 +39,6 @@ void setup() { auto cfg = in.defaultConfig(); cfg.channels = channels; cfg.sample_rate = 44100; - cfg.buffer_size = 512; - cfg.buffer_count = 10; in.begin(cfg); a2dp_source.start("LEXON MINO L", get_sound_data); diff --git a/examples/examples-audiokit/streams-synth-audiokit/streams-synth-audiokit.ino b/examples/examples-audiokit/streams-synth-audiokit/streams-synth-audiokit.ino index 70e8a5419..3c390981e 100644 --- a/examples/examples-audiokit/streams-synth-audiokit/streams-synth-audiokit.ino +++ b/examples/examples-audiokit/streams-synth-audiokit/streams-synth-audiokit.ino @@ -6,13 +6,13 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); Synthesizer synthesizer; GeneratedSoundStream in(synthesizer); StreamCopy copier(kit, in); -SynthesizerKey keys[] = {{PIN_KEY1, N_C3},{PIN_KEY2, N_D3},{PIN_KEY3, N_E3},{PIN_KEY4, N_F3},{PIN_KEY5, N_G3},{PIN_KEY6, N_A3},{0,0}}; +SynthesizerKey keys[] = {{kit.getKey(1), N_C3},{kit.getKey(2), N_D3},{kit.getKey(3), N_E3},{kit.getKey(4), N_F3},{kit.getKey(5), N_G3},{kit.getKey(6), N_A3},{0,0}}; void setup() { Serial.begin(115200); diff --git a/examples/examples-audiokit/streams-synthbasic1-audiokit/streams-synthbasic1-audiokit.ino b/examples/examples-audiokit/streams-synthbasic1-audiokit/streams-synthbasic1-audiokit.ino index fd1cbe3f5..119f252b7 100644 --- a/examples/examples-audiokit/streams-synthbasic1-audiokit/streams-synthbasic1-audiokit.ino +++ b/examples/examples-audiokit/streams-synthbasic1-audiokit/streams-synthbasic1-audiokit.ino @@ -6,9 +6,9 @@ * */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); SineWaveGenerator sine; GeneratedSoundStream in(sine); StreamCopy copier(kit, in); @@ -28,12 +28,12 @@ void setupActions(){ // assign buttons to notes auto act_low = AudioActions::ActiveLow; static float note[] = {N_C3, N_D3, N_E3, N_F3, N_G3, N_A3}; // frequencies - kit.audioActions().add(PIN_KEY1, actionKeyOn, actionKeyOff, act_low, &(note[0])); // C3 - kit.audioActions().add(PIN_KEY2, actionKeyOn, actionKeyOff, act_low, &(note[1])); // D3 - kit.audioActions().add(PIN_KEY3, actionKeyOn, actionKeyOff, act_low, &(note[2])); // E3 - kit.audioActions().add(PIN_KEY4, actionKeyOn, actionKeyOff, act_low, &(note[3])); // F3 - kit.audioActions().add(PIN_KEY5, actionKeyOn, actionKeyOff, act_low, &(note[4])); // G3 - kit.audioActions().add(PIN_KEY6, actionKeyOn, actionKeyOff, act_low, &(note[5])); // A3 + kit.audioActions().add(kit.getKey(1), actionKeyOn, actionKeyOff, act_low, &(note[0])); // C3 + kit.audioActions().add(kit.getKey(2), actionKeyOn, actionKeyOff, act_low, &(note[1])); // D3 + kit.audioActions().add(kit.getKey(3), actionKeyOn, actionKeyOff, act_low, &(note[2])); // E3 + kit.audioActions().add(kit.getKey(4), actionKeyOn, actionKeyOff, act_low, &(note[3])); // F3 + kit.audioActions().add(kit.getKey(5), actionKeyOn, actionKeyOff, act_low, &(note[4])); // G3 + kit.audioActions().add(kit.getKey(6), actionKeyOn, actionKeyOff, act_low, &(note[5])); // A3 } void setup() { diff --git a/examples/examples-audiokit/streams-synthbasic2-audiokit/streams-synthbasic2-audiokit.ino b/examples/examples-audiokit/streams-synthbasic2-audiokit/streams-synthbasic2-audiokit.ino index f944c0453..7346955e3 100644 --- a/examples/examples-audiokit/streams-synthbasic2-audiokit/streams-synthbasic2-audiokit.ino +++ b/examples/examples-audiokit/streams-synthbasic2-audiokit/streams-synthbasic2-audiokit.ino @@ -7,9 +7,9 @@ * */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); SineWaveGenerator sine; GeneratedSoundStream sine_stream(sine); AudioEffectStream effects(sine_stream); @@ -33,12 +33,12 @@ void setupActions(){ // assign buttons to notes auto act_low = AudioActions::ActiveLow; static float note[] = {N_C3, N_D3, N_E3, N_F3, N_G3, N_A3}; // frequencies - kit.audioActions().add(PIN_KEY1, actionKeyOn, actionKeyOff, act_low, &(note[0])); // C3 - kit.audioActions().add(PIN_KEY2, actionKeyOn, actionKeyOff, act_low, &(note[1])); // D3 - kit.audioActions().add(PIN_KEY3, actionKeyOn, actionKeyOff, act_low, &(note[2])); // E3 - kit.audioActions().add(PIN_KEY4, actionKeyOn, actionKeyOff, act_low, &(note[3])); // F3 - kit.audioActions().add(PIN_KEY5, actionKeyOn, actionKeyOff, act_low, &(note[4])); // G3 - kit.audioActions().add(PIN_KEY6, actionKeyOn, actionKeyOff, act_low, &(note[5])); // A3 + kit.audioActions().add(kit.getKey(1), actionKeyOn, actionKeyOff, act_low, &(note[0])); // C3 + kit.audioActions().add(kit.getKey(2), actionKeyOn, actionKeyOff, act_low, &(note[1])); // D3 + kit.audioActions().add(kit.getKey(3), actionKeyOn, actionKeyOff, act_low, &(note[2])); // E3 + kit.audioActions().add(kit.getKey(4), actionKeyOn, actionKeyOff, act_low, &(note[3])); // F3 + kit.audioActions().add(kit.getKey(5), actionKeyOn, actionKeyOff, act_low, &(note[4])); // G3 + kit.audioActions().add(kit.getKey(6), actionKeyOn, actionKeyOff, act_low, &(note[5])); // A3 } void setup() { diff --git a/examples/examples-audiokit/streams-synthbasic3-audiokit/streams-synthbasic3-audiokit.ino b/examples/examples-audiokit/streams-synthbasic3-audiokit/streams-synthbasic3-audiokit.ino index 957d8ffb1..fc463656e 100644 --- a/examples/examples-audiokit/streams-synthbasic3-audiokit/streams-synthbasic3-audiokit.ino +++ b/examples/examples-audiokit/streams-synthbasic3-audiokit/streams-synthbasic3-audiokit.ino @@ -8,14 +8,14 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include SineWaveGenerator sine; GeneratedSoundStream sine_stream(sine); ADSRGain adsr(0.0001,0.0001, 0.9 , 0.0002); AudioEffectStream effects(sine_stream); -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); StreamCopy copier(kit, effects); class SynthAction : public MidiAction { @@ -52,12 +52,12 @@ void setupActions(){ // assign buttons to notes auto act_low = AudioActions::ActiveLow; static float note[] = {N_C3, N_D3, N_E3, N_F3, N_G3, N_A3}; // frequencies - kit.audioActions().add(PIN_KEY1, actionKeyOn, actionKeyOff, act_low, &(note[0])); // C3 - kit.audioActions().add(PIN_KEY2, actionKeyOn, actionKeyOff, act_low, &(note[1])); // D3 - kit.audioActions().add(PIN_KEY3, actionKeyOn, actionKeyOff, act_low, &(note[2])); // E3 - kit.audioActions().add(PIN_KEY4, actionKeyOn, actionKeyOff, act_low, &(note[3])); // F3 - kit.audioActions().add(PIN_KEY5, actionKeyOn, actionKeyOff, act_low, &(note[4])); // G3 - kit.audioActions().add(PIN_KEY6, actionKeyOn, actionKeyOff, act_low, &(note[5])); // A3 + kit.audioActions().add(kit.getKey(1), actionKeyOn, actionKeyOff, act_low, &(note[0])); // C3 + kit.audioActions().add(kit.getKey(2), actionKeyOn, actionKeyOff, act_low, &(note[1])); // D3 + kit.audioActions().add(kit.getKey(3), actionKeyOn, actionKeyOff, act_low, &(note[2])); // E3 + kit.audioActions().add(kit.getKey(4), actionKeyOn, actionKeyOff, act_low, &(note[3])); // F3 + kit.audioActions().add(kit.getKey(5), actionKeyOn, actionKeyOff, act_low, &(note[4])); // G3 + kit.audioActions().add(kit.getKey(6), actionKeyOn, actionKeyOff, act_low, &(note[5])); // A3 } void setup() { diff --git a/examples/examples-audiokit/streams-synthstk-audiokit/README.md b/examples/examples-audiokit/streams-synthstk-audiokit/README.md index 3bfb6b0f3..f908a65f2 100644 --- a/examples/examples-audiokit/streams-synthstk-audiokit/README.md +++ b/examples/examples-audiokit/streams-synthstk-audiokit/README.md @@ -8,6 +8,6 @@ For [further info see my blog](https://www.pschatzmann.ch/home/2021/12/21/ai-thi ### Dependencies - https://github.com/pschatzmann/arduino-audio-tools -- https://github.com/pschatzmann/arduino-audiokit +- https://github.com/pschatzmann/arduino-audio-driver - https://github.com/pschatzmann/arduino-midi - https://github.com/pschatzmann/Arduino-STK diff --git a/examples/examples-audiokit/streams-synthstk-audiokit/streams-synthstk-audiokit.ino b/examples/examples-audiokit/streams-synthstk-audiokit/streams-synthstk-audiokit.ino index 3569e3f80..2db4ed957 100644 --- a/examples/examples-audiokit/streams-synthstk-audiokit/streams-synthstk-audiokit.ino +++ b/examples/examples-audiokit/streams-synthstk-audiokit/streams-synthstk-audiokit.ino @@ -5,10 +5,10 @@ * @copyright Copyright (c) 2021 */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "StkAll.h" -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); Clarinet clarinet(440); Voicer voicer; ArdStreamOut output(&kit); @@ -30,12 +30,12 @@ void setupActions(){ // assign buttons to notes auto act_low = AudioActions::ActiveLow; static int note[] = {48,50,52,53,55,57}; // midi keys - kit.audioActions().add(PIN_KEY1, actionKeyOn, actionKeyOff, act_low, &(note[0])); // C3 - kit.audioActions().add(PIN_KEY2, actionKeyOn, actionKeyOff, act_low, &(note[1])); // D3 - kit.audioActions().add(PIN_KEY3, actionKeyOn, actionKeyOff, act_low, &(note[2])); // E3 - kit.audioActions().add(PIN_KEY4, actionKeyOn, actionKeyOff, act_low, &(note[3])); // F3 - kit.audioActions().add(PIN_KEY5, actionKeyOn, actionKeyOff, act_low, &(note[4])); // G3 - kit.audioActions().add(PIN_KEY6, actionKeyOn, actionKeyOff, act_low, &(note[5])); // A3 + kit.audioActions().add(kit.getKey(1), actionKeyOn, actionKeyOff, act_low, &(note[0])); // C3 + kit.audioActions().add(kit.getKey(2), actionKeyOn, actionKeyOff, act_low, &(note[1])); // D3 + kit.audioActions().add(kit.getKey(3), actionKeyOn, actionKeyOff, act_low, &(note[2])); // E3 + kit.audioActions().add(kit.getKey(4), actionKeyOn, actionKeyOff, act_low, &(note[3])); // F3 + kit.audioActions().add(kit.getKey(5), actionKeyOn, actionKeyOff, act_low, &(note[4])); // G3 + kit.audioActions().add(kit.getKey(6), actionKeyOn, actionKeyOff, act_low, &(note[5])); // A3 } void setup() { diff --git a/examples/examples-audiokit/streams-tf-audiokit/README.md b/examples/examples-audiokit/streams-tf-audiokit/README.md index db28b232a..54f256441 100644 --- a/examples/examples-audiokit/streams-tf-audiokit/README.md +++ b/examples/examples-audiokit/streams-tf-audiokit/README.md @@ -18,5 +18,5 @@ The log level has been set to Info to help you to identify any problems. Please You need to install the following libraries: - https://github.com/pschatzmann/arduino-audio-tools -- https://github.com/pschatzmann/arduino-audiokit +- https://github.com/pschatzmann/arduino-audio-driver - https://github.com/pschatzmann/tflite-micro-arduino-examples \ No newline at end of file diff --git a/examples/examples-audiokit/streams-tf-audiokit/streams-tf-audiokit.ino b/examples/examples-audiokit/streams-tf-audiokit/streams-tf-audiokit.ino index 34a5f158b..7ceda01ab 100644 --- a/examples/examples-audiokit/streams-tf-audiokit/streams-tf-audiokit.ino +++ b/examples/examples-audiokit/streams-tf-audiokit/streams-tf-audiokit.ino @@ -10,12 +10,12 @@ */ #include "AudioTools.h" #include "AudioLibs/TfLiteAudioStream.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "model.h" TfLiteSineReader tf_reader(20000,0.3); // Audio generation logic TfLiteAudioStream tf_stream; // Audio source -> no classification so N is 0 -AudioKitStream i2s; // Audio destination +AudioBoardStream i2s(AudioKitEs8388V1); // Audio destination StreamCopy copier(i2s, tf_stream); // copy tf_stream to i2s int channels = 1; int samples_per_second = 16000; diff --git a/examples/examples-audiokit/streams-url_aac-audiokit/streams-url_aac-audiokit.ino b/examples/examples-audiokit/streams-url_aac-audiokit/streams-url_aac-audiokit.ino index 874403f32..5d981550e 100644 --- a/examples/examples-audiokit/streams-url_aac-audiokit/streams-url_aac-audiokit.ino +++ b/examples/examples-audiokit/streams-url_aac-audiokit/streams-url_aac-audiokit.ino @@ -12,11 +12,11 @@ #include "AudioTools.h" #include "AudioCodecs/CodecAACHelix.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" URLStream url("ssid","password"); // or replace with ICYStream to get metadata -AudioKitStream i2s; // final output of decoded stream +AudioBoardStream i2s(AudioKitEs8388V1); // final output of decoded stream EncodedAudioStream dec(&i2s, new AACDecoderHelix()); // Decoding stream StreamCopy copier(dec, url); // copy url to decoder diff --git a/examples/examples-audiokit/streams-url_mp3-audiokit/streams-url_mp3-audiokit.ino b/examples/examples-audiokit/streams-url_mp3-audiokit/streams-url_mp3-audiokit.ino index f9f2fd062..249f16a7f 100644 --- a/examples/examples-audiokit/streams-url_mp3-audiokit/streams-url_mp3-audiokit.ino +++ b/examples/examples-audiokit/streams-url_mp3-audiokit/streams-url_mp3-audiokit.ino @@ -12,11 +12,11 @@ #include "AudioTools.h" #include "AudioCodecs/CodecMP3Helix.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" URLStream url("ssid","password"); // or replace with ICYStream to get metadata -AudioKitStream i2s; // final output of decoded stream +AudioBoardStream i2s(AudioKitEs8388V1); // final output of decoded stream EncodedAudioStream dec(&i2s, new MP3DecoderHelix()); // Decoding stream StreamCopy copier(dec, url); // copy url to decoder diff --git a/examples/examples-basic-api/base-player-a2dp/base-player-a2dp.ino b/examples/examples-basic-api/base-player-a2dp/base-player-a2dp.ino index d028abe16..68322ddaf 100644 --- a/examples/examples-basic-api/base-player-a2dp/base-player-a2dp.ino +++ b/examples/examples-basic-api/base-player-a2dp/base-player-a2dp.ino @@ -14,7 +14,7 @@ #include "AudioLibs/AudioA2DP.h" #include "AudioLibs/AudioSourceSDFAT.h" #include "AudioCodecs/CodecMP3Helix.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" // for SD Pins int buffer_count = 30; int buffer_size = 512; diff --git a/examples/examples-communication/esp-now/codec/communication-codec-espnow-receive/communication-codec-espnow-receive.ino b/examples/examples-communication/esp-now/codec/communication-codec-espnow-receive/communication-codec-espnow-receive.ino index 793fc5538..b2d1863f0 100644 --- a/examples/examples-communication/esp-now/codec/communication-codec-espnow-receive/communication-codec-espnow-receive.ino +++ b/examples/examples-communication/esp-now/codec/communication-codec-espnow-receive/communication-codec-espnow-receive.ino @@ -11,11 +11,11 @@ #include "AudioTools.h" #include "Communication/ESPNowStream.h" #include "AudioCodecs/CodecSBC.h" -// #include "AudioLibs/AudioKit.h" +// #include "AudioLibs/AudioBoardStream.h" ESPNowStream now; -I2SStream out; // or AudioKitStream +I2SStream out; // or AudioBoardStream EncodedAudioStream decoder(&out, new SBCDecoder(256)); // decode and write to I2S - ESP Now is limited to 256 bytes StreamCopy copier(decoder, now); const char *peers[] = {"A8:48:FA:0B:93:02"}; diff --git a/examples/examples-communication/ftp/ftp-client/ftp-client.ino b/examples/examples-communication/ftp/ftp-client/ftp-client.ino index ffe664ebc..3f3db1502 100644 --- a/examples/examples-communication/ftp/ftp-client/ftp-client.ino +++ b/examples/examples-communication/ftp/ftp-client/ftp-client.ino @@ -14,13 +14,13 @@ #include "ArduinoFTPClient.h" // install https://github.com/pschatzmann/TinyFTPClient #include "AudioTools.h" // https://github.com/pschatzmann/arduino-audio-tools #include "AudioCodecs/CodecMP3Helix.h" // https://github.com/pschatzmann/arduino-libhelix -#include "AudioLibs/AudioKit.h" // https://github.com/pschatzmann/arduino-audiokit +#include "AudioLibs/AudioBoardStream.h" // https://github.com/pschatzmann/arduino-audio-driver WiFiClient cmd; WiFiClient data; FTPClient client(cmd, data); FTPFile file; -AudioKitStream kit; // or replace with e.g. I2SStream +AudioBoardStream kit(AudioKitEs8388V1); // or replace with e.g. I2SStream MP3DecoderHelix mp3; EncodedAudioStream decoder(&kit, &mp3); StreamCopy copier(decoder, file); diff --git a/examples/examples-communication/rtsp/communication-audiokit-rtsp/communication-audiokit-rtsp.ino b/examples/examples-communication/rtsp/communication-audiokit-rtsp/communication-audiokit-rtsp.ino index fc346013c..d05d0a57e 100644 --- a/examples/examples-communication/rtsp/communication-audiokit-rtsp/communication-audiokit-rtsp.ino +++ b/examples/examples-communication/rtsp/communication-audiokit-rtsp/communication-audiokit-rtsp.ino @@ -10,13 +10,13 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/RTSP.h" #include "AudioStreamer.h" #include "RTSPServer.h" int port = 554; -AudioKitStream kit; // Audio source +AudioBoardStream kit(AudioKitEs8388V1); // Audio source RTSPSourceFromAudioStream source(kit); // IAudioSource for RTSP AudioStreamer streamer = AudioStreamer(&source); // Stream audio via RTSP RTSPServer rtsp = RTSPServer(&streamer, port); @@ -30,7 +30,7 @@ void setup() { // setup Audiokit as source auto cfg = kit.defaultConfig(RX_MODE); - cfg.input_device = AUDIO_HAL_ADC_INPUT_LINE2; + cfg.input_device = ADC_INPUT_LINE2; cfg.channels = 1; cfg.sample_rate = 8000; cfg.bits_per_sample = 16; diff --git a/examples/examples-communication/rtsp/communication-rtsp-audiokit/communication-rtsp-audiokit.ino b/examples/examples-communication/rtsp/communication-rtsp-audiokit/communication-rtsp-audiokit.ino index 3d8f8fd03..34896e6f4 100644 --- a/examples/examples-communication/rtsp/communication-rtsp-audiokit/communication-rtsp-audiokit.ino +++ b/examples/examples-communication/rtsp/communication-rtsp-audiokit/communication-rtsp-audiokit.ino @@ -11,10 +11,10 @@ */ #include "AudioTools.h" // https://github.com/pschatzmann/arduino-audio-tools #include "AudioCodecs/CodecMP3Helix.h" // https://github.com/pschatzmann/arduino-libhelix -#include "AudioLibs/AudioKit.h" // https://github.com/pschatzmann/arduino-audiokit +#include "AudioLibs/AudioBoardStream.h" // https://github.com/pschatzmann/arduino-audio-driver #include "AudioLibs/AudioClientRTSP.h" // install https://github.com/pschatzmann/arduino-live555 -AudioKitStream i2s; // final output of decoded stream +AudioBoardStream i2s(AudioKitEs8388V1); // final output of decoded stream EncodedAudioStream out_mp3(&i2s, new MP3DecoderHelix()); // Decoding stream AudioClientRTSP rtsp(1024); diff --git a/examples/examples-communication/serial/send-8bit-receive/send-8bit-receive.ino b/examples/examples-communication/serial/send-8bit-receive/send-8bit-receive.ino index a080fcfbe..741d4be23 100644 --- a/examples/examples-communication/serial/send-8bit-receive/send-8bit-receive.ino +++ b/examples/examples-communication/serial/send-8bit-receive/send-8bit-receive.ino @@ -13,10 +13,10 @@ */ #include "AudioTools.h" -// #include "AudioLibs/AudioKit.h" +// #include "AudioLibs/AudioBoardStream.h" AudioInfo info(44100, 2, 16); -I2SStream out; // or AnalogAudioStream, AudioKitStream etc +I2SStream out; // or AnalogAudioStream, AudioBoardStream etc SineWaveGenerator sineWave(32000); GeneratedSoundStream sound(sineWave); auto &serial = Serial2; diff --git a/examples/examples-communication/serial/send-adpcm-receive/send-adpcm-receive.ino b/examples/examples-communication/serial/send-adpcm-receive/send-adpcm-receive.ino index 6d56e482a..5e690137d 100644 --- a/examples/examples-communication/serial/send-adpcm-receive/send-adpcm-receive.ino +++ b/examples/examples-communication/serial/send-adpcm-receive/send-adpcm-receive.ino @@ -15,10 +15,10 @@ #include "AudioTools.h" #include "AudioCodecs/CodecADPCM.h" // https://github.com/pschatzmann/adpcm -//#include "AudioLibs/AudioKit.h" +//#include "AudioLibs/AudioBoardStream.h" AudioInfo info(22000, 1, 16); -I2SStream out; // or AnalogAudioStream, AudioKitStream etc +I2SStream out; // or AnalogAudioStream, AudioBoardStream etc SineWaveGenerator sineWave(32000); GeneratedSoundStream sound(sineWave); diff --git a/examples/examples-communication/serial/send-adpcm_framed-receive/send-adpcm_framed-receive.ino b/examples/examples-communication/serial/send-adpcm_framed-receive/send-adpcm_framed-receive.ino index eb6b8417e..cd082bd38 100644 --- a/examples/examples-communication/serial/send-adpcm_framed-receive/send-adpcm_framed-receive.ino +++ b/examples/examples-communication/serial/send-adpcm_framed-receive/send-adpcm_framed-receive.ino @@ -16,10 +16,10 @@ #include "AudioTools.h" #include "AudioCodecs/CodecADPCM.h" // https://github.com/pschatzmann/adpcm #include "AudioCodecs/ContainerBinary.h" -// #include "AudioLibs/AudioKit.h" +// #include "AudioLibs/AudioBoardStream.h" AudioInfo info(44100, 2, 16); -I2SStream out; // or AnalogAudioStream, AudioKitStream etc +I2SStream out; // or AnalogAudioStream, AudioBoardStream etc SineWaveGenerator sineWave(32000); GeneratedSoundStream sound(sineWave); diff --git a/examples/examples-communication/serial/send-receive/send-receive.ino b/examples/examples-communication/serial/send-receive/send-receive.ino index e9638f771..ae896c1fa 100644 --- a/examples/examples-communication/serial/send-receive/send-receive.ino +++ b/examples/examples-communication/serial/send-receive/send-receive.ino @@ -14,12 +14,12 @@ */ #include "AudioTools.h" -// #include "AudioLibs/AudioKit.h" +// #include "AudioLibs/AudioBoardStream.h" AudioInfo info(22000, 1, 16); SineWaveGenerator sineWave(32000); GeneratedSoundStream sound(sineWave); -I2SStream out; // or AnalogAudioStream, AudioKitStream etc +I2SStream out; // or AnalogAudioStream, AudioBoardStream etc auto &serial = Serial2; Throttle throttle(serial); StreamCopy copierOut(throttle, sound, 256); // copies sound into Serial diff --git a/examples/examples-communication/udp/communication-udp-receive/communication-udp-receive.ino b/examples/examples-communication/udp/communication-udp-receive/communication-udp-receive.ino index cc2bdd5e9..147c207a3 100644 --- a/examples/examples-communication/udp/communication-udp-receive/communication-udp-receive.ino +++ b/examples/examples-communication/udp/communication-udp-receive/communication-udp-receive.ino @@ -12,14 +12,14 @@ #include "AudioTools.h" #include "Communication/UDPStream.h" -// #include "AudioLibs/AudioKit.h" +// #include "AudioLibs/AudioBoardStream.h" const char* ssid="SSID"; const char* password="password"; AudioInfo info(22000, 1, 16); UDPStream udp(ssid, password); const int udpPort = 7000; -I2SStream out; // or ony other e.g. AudioKitStream +I2SStream out; // or ony other e.g. AudioBoardStream StreamCopy copier(out, udp); void setup() { diff --git a/examples/examples-communication/vban/streams-audiokit-vban/streams-audiokit-vban.ino b/examples/examples-communication/vban/streams-audiokit-vban/streams-audiokit-vban.ino index 8185af08f..a2d06d875 100644 --- a/examples/examples-communication/vban/streams-audiokit-vban/streams-audiokit-vban.ino +++ b/examples/examples-communication/vban/streams-audiokit-vban/streams-audiokit-vban.ino @@ -6,10 +6,10 @@ #include "AudioTools.h" #include "AudioLibs/VBANStream.h" -#include "AudioLibs/AudioKit.h" // comment out when not using AudioKit +#include "AudioLibs/AudioBoardStream.h" // comment out when not using AudioKit AudioInfo info(44100, 2, 16); -AudioKitStream in; // Audio source e.g. replace with I2SStream +AudioBoardStream in; // Audio source e.g. replace with I2SStream VBANStream out; StreamCopy copier(out, in, 2048); // copies sound into i2s @@ -37,7 +37,7 @@ void setup(void) { cfg_in.buffer_size = 256; cfg_in.buffer_count = 4; cfg_in.copyFrom(info); - cfg_in.input_device = AUDIO_HAL_ADC_INPUT_LINE2; // microphone + cfg_in.input_device = ADC_INPUT_LINE2; // microphone in.begin(cfg_in); } diff --git a/examples/examples-custom-boards/cross_band_handy_walkie_talkie/cross_band_handy_walkie_talkie.ino b/examples/examples-custom-boards/cross_band_handy_walkie_talkie/cross_band_handy_walkie_talkie.ino index 106e9919c..7b467edcb 100644 --- a/examples/examples-custom-boards/cross_band_handy_walkie_talkie/cross_band_handy_walkie_talkie.ino +++ b/examples/examples-custom-boards/cross_band_handy_walkie_talkie/cross_band_handy_walkie_talkie.ino @@ -8,13 +8,13 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "SD.h" AudioInfo info(32000, 2, 16); SineWaveGenerator sineWave(32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound(sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); StreamCopy copier(out, sound); // copies sound into i2s // Arduino Setup @@ -30,7 +30,6 @@ void setup(void) { auto config = out.defaultConfig(TX_MODE); config.copyFrom(info); config.sd_active = false; - config.default_actions_active = false; // i2c config.pins.i2c_sda = 36; config.pins.i2c_scl = 35; @@ -46,7 +45,7 @@ void setup(void) { config.pins.sd_miso = 42; config.pins.sd_mosi = 43; config.pins.sd_clk = 44; - out.begin(config); + out.begin(config, false); // check SD drive if(!SD.begin(config.pins.sd_cs)){ diff --git a/examples/examples-faust/streams-faust_flute-i2s/streams-faust_flute-i2s.ino b/examples/examples-faust/streams-faust_flute-i2s/streams-faust_flute-i2s.ino index 6513651e2..a5c085fbd 100644 --- a/examples/examples-faust/streams-faust_flute-i2s/streams-faust_flute-i2s.ino +++ b/examples/examples-faust/streams-faust_flute-i2s/streams-faust_flute-i2s.ino @@ -13,12 +13,12 @@ #define USE_MEMORY_MANAGER #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/AudioFaust.h" #include "fluteMIDI.h" FaustStream faust; -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); StreamCopy copier(out, faust); // copy mic to tfl // Arduino Setup diff --git a/examples/examples-faust/streams-faust_noise-i2s/streams-faust_noise-i2s.ino b/examples/examples-faust/streams-faust_noise-i2s/streams-faust_noise-i2s.ino index c0d71a003..8930da968 100644 --- a/examples/examples-faust/streams-faust_noise-i2s/streams-faust_noise-i2s.ino +++ b/examples/examples-faust/streams-faust_noise-i2s/streams-faust_noise-i2s.ino @@ -10,12 +10,12 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/AudioFaust.h" #include "Noise.h" FaustStream faust; -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); StreamCopy copier(out, faust); // copy mic to tfl // Arduino Setup diff --git a/examples/examples-faust/streams-generator-faust-i2s/streams-generator-faust-i2s.ino b/examples/examples-faust/streams-generator-faust-i2s/streams-generator-faust-i2s.ino index 37569e85b..5df95e5d8 100644 --- a/examples/examples-faust/streams-generator-faust-i2s/streams-generator-faust-i2s.ino +++ b/examples/examples-faust/streams-generator-faust-i2s/streams-generator-faust-i2s.ino @@ -10,14 +10,14 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/AudioFaust.h" #include "volume.h" SineWaveGenerator sineWave(32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound(sineWave); // Stream generated from sine wave mydsp dsp; -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); FaustStream faust(out); StreamCopy copier(faust, sound); // copy mic to tfl diff --git a/examples/examples-faust/streams-i2s-faust_copy-i2s/streams-i2s-faust_copy-i2s.ino b/examples/examples-faust/streams-i2s-faust_copy-i2s/streams-i2s-faust_copy-i2s.ino index a224bc780..afc960262 100644 --- a/examples/examples-faust/streams-i2s-faust_copy-i2s/streams-i2s-faust_copy-i2s.ino +++ b/examples/examples-faust/streams-i2s-faust_copy-i2s/streams-i2s-faust_copy-i2s.ino @@ -11,11 +11,11 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/AudioFaust.h" #include "Copy.h" -AudioKitStream io; +AudioBoardStream io(AudioKitEs8388V1); FaustStream faust(io); // final output to io StreamCopy copier(faust, io); // copy mic to faust diff --git a/examples/examples-faust/streams-i2s-faust_guitarix-i2s/streams-i2s-faust_guitarix-i2s.ino b/examples/examples-faust/streams-i2s-faust_guitarix-i2s/streams-i2s-faust_guitarix-i2s.ino index 746a22579..beed05125 100644 --- a/examples/examples-faust/streams-i2s-faust_guitarix-i2s/streams-i2s-faust_guitarix-i2s.ino +++ b/examples/examples-faust/streams-i2s-faust_guitarix-i2s/streams-i2s-faust_guitarix-i2s.ino @@ -10,11 +10,11 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/AudioFaust.h" #include "guitarix.h" -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); FaustStream faust(kit); // final output of Faust is kit StreamCopy copier(faust, kit); // copy data from kit to faust @@ -48,7 +48,7 @@ void setup(void) { cfg_i2s.sample_rate = cfg.sample_rate; cfg_i2s.channels = cfg.channels; cfg_i2s.bits_per_sample = cfg.bits_per_sample; - cfg_i2s.input_device = AUDIO_HAL_ADC_INPUT_LINE1; + cfg_i2s.input_device = ADC_INPUT_LINE1; kit.begin(cfg_i2s); } diff --git a/examples/examples-faust/streams-i2s-faust_pitchshift-i2s/streams-i2s-faust_pitchshift-i2s.ino b/examples/examples-faust/streams-i2s-faust_pitchshift-i2s/streams-i2s-faust_pitchshift-i2s.ino index ab1c6ed8d..449f58b49 100644 --- a/examples/examples-faust/streams-i2s-faust_pitchshift-i2s/streams-i2s-faust_pitchshift-i2s.ino +++ b/examples/examples-faust/streams-i2s-faust_pitchshift-i2s/streams-i2s-faust_pitchshift-i2s.ino @@ -10,11 +10,11 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/AudioFaust.h" #include "pitchShifter.h" -AudioKitStream io; +AudioBoardStream io(AudioKitEs8388V1); FaustStream faust(io); // final output to io StreamCopy copier(faust, io); // copy mic to faust diff --git a/examples/examples-maximilian/12-SamplePlayer/12-SamplePlayer.ino b/examples/examples-maximilian/12-SamplePlayer/12-SamplePlayer.ino index 5d0227a8f..039cf2c40 100755 --- a/examples/examples-maximilian/12-SamplePlayer/12-SamplePlayer.ino +++ b/examples/examples-maximilian/12-SamplePlayer/12-SamplePlayer.ino @@ -1,13 +1,13 @@ #include "AudioTools.h" #include "AudioLibs/MaximilianDSP.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "maximilian.h" #include #include // Define Arduino output -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); Maximilian maximilian(out); // MAXIMILIAN diff --git a/examples/examples-player/player-sdfat-a2dp/player-sdfat-a2dp.ino b/examples/examples-player/player-sdfat-a2dp/player-sdfat-a2dp.ino index 0fe38cd3b..2a3ce1a3c 100644 --- a/examples/examples-player/player-sdfat-a2dp/player-sdfat-a2dp.ino +++ b/examples/examples-player/player-sdfat-a2dp/player-sdfat-a2dp.ino @@ -13,7 +13,6 @@ #include "AudioLibs/AudioA2DP.h" #include "AudioLibs/AudioSourceSDFAT.h" #include "AudioCodecs/CodecMP3Helix.h" -//#include "AudioLibs/AudioKit.h" const char *startFilePath="/"; const char* ext="mp3"; diff --git a/examples/examples-stk/streams-stk-audiokit/streams-stk-audiokit.ino b/examples/examples-stk/streams-stk-audiokit/streams-stk-audiokit.ino index 2698cd105..d6aedec0a 100644 --- a/examples/examples-stk/streams-stk-audiokit/streams-stk-audiokit.ino +++ b/examples/examples-stk/streams-stk-audiokit/streams-stk-audiokit.ino @@ -2,17 +2,17 @@ * @file streams-stk-audioout.ino * @brief Plays random notes on instrument. For available instruments * see https://pschatzmann.github.io/Arduino-STK/html/classstk_1_1Instrmnt.html - * I used an AudioKitStream to test the output, but you can replace it with any other output class (e.g. I2SStream) + * I used an AudioBoardStream to test the output, but you can replace it with any other output class (e.g. I2SStream) * @author Phil Schatzmann * @copyright Copyright (c) 2021 */ #include "AudioTools.h" #include "AudioLibs/AudioSTK.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" Sitar instrument(440); STKStream in(instrument); -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); StreamCopy copier(out, in); MusicalNotes notes; diff --git a/examples/examples-stk/streams-stk_allinstruments-audiokit/streams-stk_allinstruments-audiokit.ino b/examples/examples-stk/streams-stk_allinstruments-audiokit/streams-stk_allinstruments-audiokit.ino index d6dc1a84c..7ac6592c6 100644 --- a/examples/examples-stk/streams-stk_allinstruments-audiokit/streams-stk_allinstruments-audiokit.ino +++ b/examples/examples-stk/streams-stk_allinstruments-audiokit/streams-stk_allinstruments-audiokit.ino @@ -11,8 +11,8 @@ #include "AudioLibs/PortAudioStream.h" typedef PortAudioStream MyStdOut; #else -#include "AudioLibs/AudioKit.h" -typedef AudioKitStream MyStdOut; +#include "AudioLibs/AudioBoardStream.h" +typedef AudioBoardStream MyStdOut; #endif Instrmnt *p_Instrmnt=nullptr; // will be allocated dynamically diff --git a/examples/examples-stk/streams-stk_files-audiokit/streams-stk_files-audiokit.ino b/examples/examples-stk/streams-stk_files-audiokit/streams-stk_files-audiokit.ino index 14525bd38..a182a18a4 100644 --- a/examples/examples-stk/streams-stk_files-audiokit/streams-stk_files-audiokit.ino +++ b/examples/examples-stk/streams-stk_files-audiokit/streams-stk_files-audiokit.ino @@ -11,11 +11,11 @@ #include "SD_MMC.h" #include "AudioTools.h" #include "AudioLibs/AudioSTK.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" STKStream in; -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); StreamCopy copier(out, in); MusicalNotes notes; Instrmnt* p_instrument=nullptr; // instrument depends on file system diff --git a/examples/examples-stk/streams-stk_generator-audiokit/streams-stk_generator-audiokit.ino b/examples/examples-stk/streams-stk_generator-audiokit/streams-stk_generator-audiokit.ino index c8df667e9..f2d2eaebe 100644 --- a/examples/examples-stk/streams-stk_generator-audiokit/streams-stk_generator-audiokit.ino +++ b/examples/examples-stk/streams-stk_generator-audiokit/streams-stk_generator-audiokit.ino @@ -7,13 +7,13 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/AudioSTK.h" Clarinet clarinet(440); // the stk clarinet instrument STKGenerator generator(clarinet); // subclass of SoundGenerator GeneratedSoundStream in(generator); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); StreamCopy copier(out, in); // copy stkStream to a2dpStream MusicalNotes notes; // notes with frequencies diff --git a/examples/examples-stk/streams-stk_loop-audiokit/streams-stk_loop-audiokit.ino b/examples/examples-stk/streams-stk_loop-audiokit/streams-stk_loop-audiokit.ino index f8abb1b85..5460766e0 100644 --- a/examples/examples-stk/streams-stk_loop-audiokit/streams-stk_loop-audiokit.ino +++ b/examples/examples-stk/streams-stk_loop-audiokit/streams-stk_loop-audiokit.ino @@ -9,12 +9,12 @@ * */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioLibs/AudioSTK.h" MemoryLoop mloop("crashcym.raw", crashcym_raw, crashcym_raw_len); STKStream in(mloop); -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); StreamCopy copier(out, in); void setup() { diff --git a/examples/examples-stk/streams-stk_myinstrument-audiokit/streams-stk_myinstrument-audiokit.ino b/examples/examples-stk/streams-stk_myinstrument-audiokit/streams-stk_myinstrument-audiokit.ino index d71d60109..dae52ea88 100644 --- a/examples/examples-stk/streams-stk_myinstrument-audiokit/streams-stk_myinstrument-audiokit.ino +++ b/examples/examples-stk/streams-stk_myinstrument-audiokit/streams-stk_myinstrument-audiokit.ino @@ -6,12 +6,12 @@ */ #include "AudioTools.h" #include "AudioLibs/AudioSTK.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "MyFirstInstrument.h" MyFirstInstrument instrument; STKStream in(instrument); -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); StreamCopy copier(out, in); MusicalNotes notes; diff --git a/examples/examples-stk/streams-stk_sine-audiokit/streams-stk_sine-audiokit.ino b/examples/examples-stk/streams-stk_sine-audiokit/streams-stk_sine-audiokit.ino index 00353bef4..84e0292d9 100644 --- a/examples/examples-stk/streams-stk_sine-audiokit/streams-stk_sine-audiokit.ino +++ b/examples/examples-stk/streams-stk_sine-audiokit/streams-stk_sine-audiokit.ino @@ -8,11 +8,11 @@ #include "SD_MMC.h" #include "AudioTools.h" #include "AudioLibs/AudioSTK.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" SineWave sine; STKStream in(sine); -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); StreamCopy copier(out, in); MusicalNotes notes; diff --git a/examples/examples-stk/streams-stk_synth-audiokit/README.md b/examples/examples-stk/streams-stk_synth-audiokit/README.md index af2108724..8e7308330 100644 --- a/examples/examples-stk/streams-stk_synth-audiokit/README.md +++ b/examples/examples-stk/streams-stk_synth-audiokit/README.md @@ -10,6 +10,6 @@ For [further info see my blog](https://www.pschatzmann.ch/home/2021/12/21/ai-thi ### Dependencies - https://github.com/pschatzmann/arduino-audio-tools -- https://github.com/pschatzmann/arduino-audiokit +- https://github.com/pschatzmann/arduino-audio-driver - https://github.com/pschatzmann/arduino-midi - https://github.com/pschatzmann/Arduino-STK diff --git a/examples/examples-stk/streams-stk_synth-audiokit/streams-stk_synth-audiokit.ino b/examples/examples-stk/streams-stk_synth-audiokit/streams-stk_synth-audiokit.ino index 2474be2ca..a463826bb 100644 --- a/examples/examples-stk/streams-stk_synth-audiokit/streams-stk_synth-audiokit.ino +++ b/examples/examples-stk/streams-stk_synth-audiokit/streams-stk_synth-audiokit.ino @@ -5,10 +5,10 @@ * @copyright Copyright (c) 2021 */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "StkAll.h" -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); Clarinet clarinet(440); Voicer voicer; ArdStreamOut output(&kit); @@ -30,12 +30,12 @@ void setupActions(){ // assign buttons to notes auto act_low = AudioActions::ActiveLow; static int note[] = {48,50,52,53,55,57}; // midi keys - kit.audioActions().add(PIN_KEY1, actionKeyOn, actionKeyOff, act_low, &(note[0])); // C3 - kit.audioActions().add(PIN_KEY2, actionKeyOn, actionKeyOff, act_low, &(note[1])); // D3 - kit.audioActions().add(PIN_KEY3, actionKeyOn, actionKeyOff, act_low, &(note[2])); // E3 - kit.audioActions().add(PIN_KEY4, actionKeyOn, actionKeyOff, act_low, &(note[3])); // F3 - kit.audioActions().add(PIN_KEY5, actionKeyOn, actionKeyOff, act_low, &(note[4])); // G3 - kit.audioActions().add(PIN_KEY6, actionKeyOn, actionKeyOff, act_low, &(note[5])); // A3 + kit.audioActions().add(kit.getKey(1), actionKeyOn, actionKeyOff, act_low, &(note[0])); // C3 + kit.audioActions().add(kit.getKey(2), actionKeyOn, actionKeyOff, act_low, &(note[1])); // D3 + kit.audioActions().add(kit.getKey(3), actionKeyOn, actionKeyOff, act_low, &(note[2])); // E3 + kit.audioActions().add(kit.getKey(4), actionKeyOn, actionKeyOff, act_low, &(note[3])); // F3 + kit.audioActions().add(kit.getKey(5), actionKeyOn, actionKeyOff, act_low, &(note[4])); // G3 + kit.audioActions().add(kit.getKey(6), actionKeyOn, actionKeyOff, act_low, &(note[5])); // A3 } void setup() { diff --git a/examples/examples-stream/streams-adsr-i2s/streams-adsr-i2s.ino b/examples/examples-stream/streams-adsr-i2s/streams-adsr-i2s.ino index f7eb54893..d2d787df6 100644 --- a/examples/examples-stream/streams-adsr-i2s/streams-adsr-i2s.ino +++ b/examples/examples-stream/streams-adsr-i2s/streams-adsr-i2s.ino @@ -6,9 +6,9 @@ * */ #include "AudioTools.h" -//#include "AudioLibs/AudioKit.h" +//#include "AudioLibs/AudioBoardStream.h" -I2SStream i2s; //AudioKitStream +I2SStream i2s; //AudioBoardStream SineWaveGenerator sine; GeneratedSoundStream stream(sine); AudioEffectStream effects(stream); diff --git a/examples/examples-stream/streams-generator-formatconverter-i2s/streams-generator-formatconverter-i2s.ino b/examples/examples-stream/streams-generator-formatconverter-i2s/streams-generator-formatconverter-i2s.ino index 4aa8bf069..c78697b1e 100644 --- a/examples/examples-stream/streams-generator-formatconverter-i2s/streams-generator-formatconverter-i2s.ino +++ b/examples/examples-stream/streams-generator-formatconverter-i2s/streams-generator-formatconverter-i2s.ino @@ -8,13 +8,13 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo from(32000,2,32); AudioInfo to(16000,1,16); SineWaveGenerator sineWave; GeneratedSoundStream sound(sineWave); // Stream generated from sine wave -I2SStream out; // or any other e.g. AudioKitStream, CsvOutput out(Serial); +I2SStream out; // or any other e.g. AudioBoardStream, CsvOutput out(Serial); FormatConverterStream converter(sound); // or use converter(out) StreamCopy copier(out, converter); // copier(converter, sound); diff --git a/examples/examples-stream/streams-generator_fromarray-analog/streams-generator_fromarray-analog.ino b/examples/examples-stream/streams-generator_fromarray-analog/streams-generator_fromarray-analog.ino index 94856bdd8..c091517ec 100644 --- a/examples/examples-stream/streams-generator_fromarray-analog/streams-generator_fromarray-analog.ino +++ b/examples/examples-stream/streams-generator_fromarray-analog/streams-generator_fromarray-analog.ino @@ -9,7 +9,7 @@ * */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(44100, 1, 16); int16_t sine_array[] = {0, 4560, 9031, 13327, 17363, 21062, 24350, 27165, 29450, 31163, 32269, 32747, 32587, 31793, 30381, 28377, 25820, 22761, 19259, 15383, 11206, 6812, 2285, -2285, -6812, -11206, -15383, -19259, -22761, -25820, -28377, -30381, -31793, -32587, -32747, -32269, -31163, -29450, -27165, -24350, -21062, -17363, -13327, -9031, -4560 }; diff --git a/examples/examples-tts/streams-espeak-audiokit/streams-espeak-audiokit.ino b/examples/examples-tts/streams-espeak-audiokit/streams-espeak-audiokit.ino index 9fce585ec..b635982db 100644 --- a/examples/examples-tts/streams-espeak-audiokit/streams-espeak-audiokit.ino +++ b/examples/examples-tts/streams-espeak-audiokit/streams-espeak-audiokit.ino @@ -11,11 +11,11 @@ */ #include "AudioTools.h" // https://github.com/pschatzmann/arduino-audio-tools -#include "AudioLibs/AudioKit.h" // https://github.com/pschatzmann/arduino-audiokit +#include "AudioLibs/AudioBoardStream.h" // https://github.com/pschatzmann/arduino-audio-driver #include "FileSystems.h" // https://github.com/pschatzmann/arduino-posix-fs #include "espeak.h" -AudioKitStream i2s; +AudioBoardStream i2s(AudioKitEs8388V1); ESpeak espeak(i2s); void setup() { diff --git a/examples/examples-tts/streams-flite-audiokit/README.md b/examples/examples-tts/streams-flite-audiokit/README.md index a57cb18d8..c60b9197f 100644 --- a/examples/examples-tts/streams-flite-audiokit/README.md +++ b/examples/examples-tts/streams-flite-audiokit/README.md @@ -12,7 +12,7 @@ The output goes to a ‘AI Thinker Audio Kit’. You need to install the following libraries: - [Arduino Audio Tools](https://github.com/pschatzmann/arduino-audio-tools) -- [AudioKit](https://github.com/pschatzmann/arduino-audiokit) +- [Audio Driver](https://github.com/pschatzmann/arduino-audio-driver) - [FLITE](https://github.com/pschatzmann/arduino-flite) FLITE is quite big: you need to set the Partition Schema to Huge APP diff --git a/examples/examples-tts/streams-flite-audiokit/streams-flite-audiokit.ino b/examples/examples-tts/streams-flite-audiokit/streams-flite-audiokit.ino index eebdce7ba..52f565a34 100644 --- a/examples/examples-tts/streams-flite-audiokit/streams-flite-audiokit.ino +++ b/examples/examples-tts/streams-flite-audiokit/streams-flite-audiokit.ino @@ -8,9 +8,9 @@ #include "flite_arduino.h" #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); Flite flite(kit); const char* alice = "Hallo my name is FLITE"; diff --git a/examples/examples-tts/streams-flite-i2s/streams-flite-i2s.ino b/examples/examples-tts/streams-flite-i2s/streams-flite-i2s.ino index c9eca9668..0e38769af 100644 --- a/examples/examples-tts/streams-flite-i2s/streams-flite-i2s.ino +++ b/examples/examples-tts/streams-flite-i2s/streams-flite-i2s.ino @@ -8,9 +8,9 @@ #include "flite_arduino.h" #include "AudioTools.h" -//#include "AudioLibs/AudioKit.h" +//#include "AudioLibs/AudioBoardStream.h" -I2SStream out; // Replace with desired class e.g. AudioKitStream, AnalogAudioStream etc. +I2SStream out; // Replace with desired class e.g. AudioBoardStream, AnalogAudioStream etc. Flite flite(out); diff --git a/examples/examples-tts/streams-google-audiokit/streams-google-audiokit.ino b/examples/examples-tts/streams-google-audiokit/streams-google-audiokit.ino index bbf1b65b2..7189ec1e6 100644 --- a/examples/examples-tts/streams-google-audiokit/streams-google-audiokit.ino +++ b/examples/examples-tts/streams-google-audiokit/streams-google-audiokit.ino @@ -13,11 +13,11 @@ #include "AudioTools.h" #include "AudioCodecs/CodecMP3Helix.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" URLStream url("ssid","password"); -AudioKitStream i2s; // final output of decoded stream +AudioBoardStream i2s(AudioKitEs8388V1); // final output of decoded stream EncodedAudioStream dec(&i2s, new MP3DecoderHelix()); // Decoding stream StreamCopy copier(dec, url); // copy url to decoder StrExt query("http://translate.google.com/translate_tts?ie=UTF-8&tl=%1&client=tw-ob&ttsspeed=%2&q=%3"); diff --git a/examples/examples-tts/streams-sam-audiokit/README.md b/examples/examples-tts/streams-sam-audiokit/README.md index 7e3e5120d..777d8cc4c 100644 --- a/examples/examples-tts/streams-sam-audiokit/README.md +++ b/examples/examples-tts/streams-sam-audiokit/README.md @@ -12,7 +12,7 @@ The output goes to a ‘AI Thinker Audio Kit’. You need to install the following libraries: - [Arduino Audio Tools](https://github.com/pschatzmann/arduino-audio-tools) -- [AudioKit](https://github.com/pschatzmann/arduino-audiokit) +- [Audio Driver](https://github.com/pschatzmann/arduino-audio-driver) - [SAM](https://github.com/pschatzmann/arduino-SAM) diff --git a/examples/examples-tts/streams-sam-audiokit/streams-sam-audiokit.ino b/examples/examples-tts/streams-sam-audiokit/streams-sam-audiokit.ino index 7c32d20fe..b36cc92b2 100644 --- a/examples/examples-tts/streams-sam-audiokit/streams-sam-audiokit.ino +++ b/examples/examples-tts/streams-sam-audiokit/streams-sam-audiokit.ino @@ -7,10 +7,10 @@ */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "sam_arduino.h" -AudioKitStream kit; +AudioBoardStream kit(AudioKitEs8388V1); SAM sam(kit); const char* text = "Hallo my name is SAM"; diff --git a/examples/examples-tts/streams-sam-i2s/streams-sam-i2s.ino b/examples/examples-tts/streams-sam-i2s/streams-sam-i2s.ino index a95691c52..ba912922e 100644 --- a/examples/examples-tts/streams-sam-i2s/streams-sam-i2s.ino +++ b/examples/examples-tts/streams-sam-i2s/streams-sam-i2s.ino @@ -7,10 +7,10 @@ */ #include "AudioTools.h" #include "sam_arduino.h" -//#include "AudioLibs/AudioKit.h" +//#include "AudioLibs/AudioBoardStream.h" -I2SStream out; // Replace with desired class e.g. AudioKitStream, AnalogAudioStream etc. +I2SStream out; // Replace with desired class e.g. AudioBoardStream, AnalogAudioStream etc. SAM sam(out, false); // Callback which provides the audio data diff --git a/examples/examples-tts/streams-simple_tts-i2s/streams-simple_tts-i2s.ino b/examples/examples-tts/streams-simple_tts-i2s/streams-simple_tts-i2s.ino index b250ade9c..04ac50e65 100644 --- a/examples/examples-tts/streams-simple_tts-i2s/streams-simple_tts-i2s.ino +++ b/examples/examples-tts/streams-simple_tts-i2s/streams-simple_tts-i2s.ino @@ -8,11 +8,11 @@ #include "SimpleTTS.h" #include "AudioCodecs/CodecMP3Helix.h" -//#include "AudioLibs/AudioKit.h" +//#include "AudioLibs/AudioBoardStream.h" NumberToText ntt; -I2SStream out; // Replace with desired class e.g. AudioKitStream, AnalogAudioStream etc. +I2SStream out; // Replace with desired class e.g. AudioBoardStream, AnalogAudioStream etc. MP3DecoderHelix mp3; AudioDictionary dictionary(ExampleAudioDictionaryValues); TextToSpeech tts(ntt, out, mp3, dictionary); diff --git a/examples/examples-tts/streams-tts-i2s/streams-tts-i2s.ino b/examples/examples-tts/streams-tts-i2s/streams-tts-i2s.ino index 4ab83e32f..a6711b8da 100644 --- a/examples/examples-tts/streams-tts-i2s/streams-tts-i2s.ino +++ b/examples/examples-tts/streams-tts-i2s/streams-tts-i2s.ino @@ -8,9 +8,9 @@ #include "AudioTools.h" #include "TTS.h" -//#include "AudioLibs/AudioKit.h" +//#include "AudioLibs/AudioBoardStream.h" -I2SStream out; // Replace with desired class e.g. AudioKitStream, AnalogAudioStream etc. +I2SStream out; // Replace with desired class e.g. AudioBoardStream, AnalogAudioStream etc. TTS tts = TTS(out); diff --git a/examples/examples-tts/streams-url_wav-i2s/streams-url_wav-i2s.ino b/examples/examples-tts/streams-url_wav-i2s/streams-url_wav-i2s.ino index ff411572f..94dc24036 100644 --- a/examples/examples-tts/streams-url_wav-i2s/streams-url_wav-i2s.ino +++ b/examples/examples-tts/streams-url_wav-i2s/streams-url_wav-i2s.ino @@ -15,7 +15,7 @@ URLStream url("ssid","password"); I2SStream i2s; // I2S stream WAVDecoder decoder; // decode wav to pcm and send it to I2S -EncodedAudioStream out(i2s, decoder); // Decoder stream +EncodedAudioStream out(&i2s, &decoder); // Decoder stream StreamCopy copier(out, url); // copy in to out diff --git a/examples/sandbox/ble/client-as-source/communication-ble-server-receive/communication-ble-server-receive.ino b/examples/sandbox/ble/client-as-source/communication-ble-server-receive/communication-ble-server-receive.ino index b7a111520..4e0e2e756 100644 --- a/examples/sandbox/ble/client-as-source/communication-ble-server-receive/communication-ble-server-receive.ino +++ b/examples/sandbox/ble/client-as-source/communication-ble-server-receive/communication-ble-server-receive.ino @@ -12,11 +12,11 @@ #include "AudioTools.h" #include "AudioCodecs/CodecADPCM.h" // https://github.com/pschatzmann/adpcm #include "Sandbox/BLE/AudioBLE.h" -//#include "AudioLibs/AudioKit.h" +//#include "AudioLibs/AudioBoardStream.h" AudioInfo info(16000, 1, 16); ADPCMDecoder adpcm(AV_CODEC_ID_ADPCM_IMA_WAV); -I2SStream i2s; // or AudioKitStream ... +I2SStream i2s; // or AudioBoardStream ... EncodedAudioStream decoder(&i2s, &adpcm); AudioBLEServer ble; StreamCopy copier(decoder, ble); diff --git a/examples/sandbox/ble/server-as-source/communication-ble-client-receive/communication-ble-client-receive.ino b/examples/sandbox/ble/server-as-source/communication-ble-client-receive/communication-ble-client-receive.ino index c684c4c76..c771558c1 100644 --- a/examples/sandbox/ble/server-as-source/communication-ble-client-receive/communication-ble-client-receive.ino +++ b/examples/sandbox/ble/server-as-source/communication-ble-client-receive/communication-ble-client-receive.ino @@ -11,7 +11,7 @@ #include "AudioTools.h" -//#include "AudioLibs/AudioKit.h" +//#include "AudioLibs/AudioBoardStream.h" #include "AudioCodecs/CodecADPCM.h" // https://github.com/pschatzmann/adpcm #include "Sandbox/BLE/AudioBLE.h" diff --git a/examples/sandbox/ggwave/receive/receive.ino b/examples/sandbox/ggwave/receive/receive.ino index 94313600f..d6ea25a2f 100644 --- a/examples/sandbox/ggwave/receive/receive.ino +++ b/examples/sandbox/ggwave/receive/receive.ino @@ -12,11 +12,11 @@ #include "AudioTools.h" #include "Experiments/CodecGGWave.h" // https://github.com/ggerganov/ggwave-arduinop -#include "AudioLibs/AudioKit.h" // https://github.com/pschatzmann/arduino-audiokit.git +#include "AudioLibs/AudioBoardStream.h" // https://github.com/pschatzmann/arduino-audio-driver.git int sample_rate = GGWAVE_DEFAULT_SAMPLE_RATE; int channels = 1; -AudioKitStream in; // or AudioKitStream +AudioBoardStream in; // or AudioBoardStream GGWaveDecoder dec; EncodedAudioStream encoder_stream(Serial, dec); // decode and write to I2S - ESP Now is limited to 256 bytes StreamCopy copier(encoder_stream, in, GGWAVE_DEFAULT_BYTES_PER_FRAME); // copy mic to tfl @@ -30,7 +30,7 @@ void setup() { auto config = in.defaultConfig(RX_MODE); config.sample_rate = sample_rate; config.channels = channels; - config.input_device = AUDIO_HAL_ADC_INPUT_LINE2; // microphone + config.input_device = ADC_INPUT_LINE2; // microphone in.begin(config); // setup codec diff --git a/examples/sandbox/ggwave/send/send.ino b/examples/sandbox/ggwave/send/send.ino index 087923fcf..c6afebf57 100644 --- a/examples/sandbox/ggwave/send/send.ino +++ b/examples/sandbox/ggwave/send/send.ino @@ -12,11 +12,11 @@ #include "AudioTools.h" #include "Experiments/CodecGGWave.h" // https://github.com/ggerganov/ggwave-arduinop -#include "AudioLibs/AudioKit.h" // https://github.com/pschatzmann/arduino-audiokit.git +#include "AudioLibs/AudioBoardStream.h" // https://github.com/pschatzmann/arduino-audio-driver.git int sample_rate = GGWAVE_DEFAULT_SAMPLE_RATE; int channels = 1; -AudioKitStream out; // or AudioKitStream +AudioBoardStream out(AudioKitEs8388V1); // or AudioBoardStream GGWaveEncoder enc; EncodedAudioStream encoder_stream(&out, &enc); // decode and write to I2S - ESP Now is limited to 256 bytes diff --git a/examples/sandbox/send-hdlc-receive/send-hdlc-receive.ino b/examples/sandbox/send-hdlc-receive/send-hdlc-receive.ino index 227b1a6ef..1e738645a 100644 --- a/examples/sandbox/send-hdlc-receive/send-hdlc-receive.ino +++ b/examples/sandbox/send-hdlc-receive/send-hdlc-receive.ino @@ -17,7 +17,7 @@ #include "AudioTools.h" #include "Communication/HDLCStream.h" -// #include "AudioLibs/AudioKit.h" +// #include "AudioLibs/AudioBoardStream.h" AudioInfo info(8000, 1, 16); SineWaveGenerator sineWave(32000); diff --git a/examples/sandbox/test-container-avi/test-container-avi.ino b/examples/sandbox/test-container-avi/test-container-avi.ino index cc9d66edc..e6d403844 100644 --- a/examples/sandbox/test-container-avi/test-container-avi.ino +++ b/examples/sandbox/test-container-avi/test-container-avi.ino @@ -10,10 +10,10 @@ */ #include "AudioTools.h" #include "AudioCodecs/ContainerAVI.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" URLStream url("ssid","password"); // input -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); DecoderL8 l8(false); AVIDecoder codec(&l8); EncodedAudioStream avi(&out, &codec); diff --git a/examples/tests/24bits/24bits-write/24bits-write.ino b/examples/tests/24bits/24bits-write/24bits-write.ino index 4a1c40afc..6e8c7ebcf 100644 --- a/examples/tests/24bits/24bits-write/24bits-write.ino +++ b/examples/tests/24bits/24bits-write/24bits-write.ino @@ -1,8 +1,8 @@ #include "Arduino.h" #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); //CsvOutput out(Serial); SineWaveGenerator sine_wave; // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream in_stream(sine_wave); // Stream generated from sine wave diff --git a/examples/tests/callback/callback-write/callback-write.ino b/examples/tests/callback/callback-write/callback-write.ino index 11be753fa..b6e64d9e6 100644 --- a/examples/tests/callback/callback-write/callback-write.ino +++ b/examples/tests/callback/callback-write/callback-write.ino @@ -1,5 +1,5 @@ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(44100, 2, 16); SineWaveGenerator sineWave; // subclass of SoundGenerator with max amplitude of 32000 @@ -12,7 +12,7 @@ auto invert = [](uint8_t* data, size_t bytes) { } return bytes; }; -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); CallbackStream cb(out, invert); StreamCopy copier(cb, sound); // copies sound into i2s diff --git a/examples/tests/codecs/test-codec-adpcm-xq/test-codec-adpcm-xq.ino b/examples/tests/codecs/test-codec-adpcm-xq/test-codec-adpcm-xq.ino index 184dd5c29..f52bd621f 100644 --- a/examples/tests/codecs/test-codec-adpcm-xq/test-codec-adpcm-xq.ino +++ b/examples/tests/codecs/test-codec-adpcm-xq/test-codec-adpcm-xq.ino @@ -10,14 +10,14 @@ */ #include "AudioTools.h" #include "AudioCodecs/CodecADPCMXQ.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(44100, 2, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave -//AudioKitStream out; +//AudioBoardStream out(AudioKitEs8388V1); //I2SStream out; -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); EncodedAudioStream decoder(&out, new ADPCMDecoderXQ()); // encode and write EncodedAudioStream encoder(&decoder, new ADPCMEncoderXQ()); // encode and write StreamCopy copier(encoder, sound); diff --git a/examples/tests/codecs/test-codec-adpcm/test-codec-adpcm.ino b/examples/tests/codecs/test-codec-adpcm/test-codec-adpcm.ino index cf4c0490b..7d4c0e641 100644 --- a/examples/tests/codecs/test-codec-adpcm/test-codec-adpcm.ino +++ b/examples/tests/codecs/test-codec-adpcm/test-codec-adpcm.ino @@ -11,14 +11,14 @@ */ #include "AudioTools.h" #include "AudioCodecs/CodecADPCM.h" // https://github.com/pschatzmann/adpcm -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(44100, 2, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave -//AudioKitStream out; +//AudioBoardStream out(AudioKitEs8388V1); //I2SStream out; -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); EncodedAudioStream decoder(&out, new ADPCMDecoder(AV_CODEC_ID_ADPCM_IMA_WAV)); // encode and write EncodedAudioStream encoder(&decoder, new ADPCMEncoder(AV_CODEC_ID_ADPCM_IMA_WAV)); // encode and write StreamCopy copier(encoder, sound); diff --git a/examples/tests/codecs/test-codec-aptx/test-codec-aptx.ino b/examples/tests/codecs/test-codec-aptx/test-codec-aptx.ino index 0b290d40b..5af7c86c1 100644 --- a/examples/tests/codecs/test-codec-aptx/test-codec-aptx.ino +++ b/examples/tests/codecs/test-codec-aptx/test-codec-aptx.ino @@ -10,14 +10,14 @@ */ #include "AudioTools.h" #include "AudioCodecs/CodecAPTX.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(24000, 2, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave -//AudioKitStream out; +//AudioBoardStream out(AudioKitEs8388V1); //I2SStream out; -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); EncodedAudioStream decoder(&out, new APTXDecoder()); // encode and write EncodedAudioStream encoder(&decoder, new APTXEncoder()); // encode and write StreamCopy copier(encoder, sound); diff --git a/examples/tests/codecs/test-codec-base64/test-codec-base64.ino b/examples/tests/codecs/test-codec-base64/test-codec-base64.ino index 463e7aac7..90a23c283 100644 --- a/examples/tests/codecs/test-codec-base64/test-codec-base64.ino +++ b/examples/tests/codecs/test-codec-base64/test-codec-base64.ino @@ -9,12 +9,12 @@ * */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(8000, 1, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); EncodedAudioStream decoder(&out, new DecoderBase64()); // encode and write EncodedAudioStream encoder(&decoder, new EncoderBase64()); // encode and write StreamCopy copier(encoder, sound); diff --git a/examples/tests/codecs/test-codec-codec2/test-codec-codec2.ino b/examples/tests/codecs/test-codec-codec2/test-codec-codec2.ino index 000a3a4e8..87d5c8231 100644 --- a/examples/tests/codecs/test-codec-codec2/test-codec-codec2.ino +++ b/examples/tests/codecs/test-codec-codec2/test-codec-codec2.ino @@ -13,13 +13,13 @@ */ #include "AudioTools.h" #include "AudioCodecs/CodecCodec2.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(8000, 1, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave //CsvOutput out(Serial, channels); -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); EncodedAudioStream decoder(&out, new Codec2Decoder()); // encode and write EncodedAudioStream encoder(&decoder, new Codec2Encoder()); // encode and write StreamCopy copier(encoder, sound); diff --git a/examples/tests/codecs/test-codec-flac/test-codec-flac.ino b/examples/tests/codecs/test-codec-flac/test-codec-flac.ino index e0b40872b..77bf41759 100644 --- a/examples/tests/codecs/test-codec-flac/test-codec-flac.ino +++ b/examples/tests/codecs/test-codec-flac/test-codec-flac.ino @@ -10,7 +10,7 @@ */ #include "AudioTools.h" #include "AudioCodecs/CodecFLAC.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(44100, 2, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 diff --git a/examples/tests/codecs/test-codec-g711_alaw/test-codec-g711_alaw.ino b/examples/tests/codecs/test-codec-g711_alaw/test-codec-g711_alaw.ino index c4e3ec148..4900d17e5 100644 --- a/examples/tests/codecs/test-codec-g711_alaw/test-codec-g711_alaw.ino +++ b/examples/tests/codecs/test-codec-g711_alaw/test-codec-g711_alaw.ino @@ -10,12 +10,12 @@ */ #include "AudioTools.h" #include "AudioCodecs/CodecG7xx.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(8000, 1, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); EncodedAudioStream decoder(&out, new G711_ALAWDecoder()); // encode and write EncodedAudioStream encoder(&decoder, new G711_ALAWEncoder()); // encode and write StreamCopy copier(encoder, sound); diff --git a/examples/tests/codecs/test-codec-g711_ulaw/test-codec-g711_ulaw.ino b/examples/tests/codecs/test-codec-g711_ulaw/test-codec-g711_ulaw.ino index f6898d9f9..9280c81eb 100644 --- a/examples/tests/codecs/test-codec-g711_ulaw/test-codec-g711_ulaw.ino +++ b/examples/tests/codecs/test-codec-g711_ulaw/test-codec-g711_ulaw.ino @@ -10,12 +10,12 @@ */ #include "AudioTools.h" #include "AudioCodecs/CodecG7xx.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(8000, 1, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); EncodedAudioStream decoder(&out, new G711_ULAWDecoder()); // encode and write EncodedAudioStream encoder(&decoder, new G711_ULAWEncoder()); // encode and write StreamCopy copier(encoder, sound); diff --git a/examples/tests/codecs/test-codec-g721/test-codec-g721.ino b/examples/tests/codecs/test-codec-g721/test-codec-g721.ino index 6c25a7248..31e619b18 100644 --- a/examples/tests/codecs/test-codec-g721/test-codec-g721.ino +++ b/examples/tests/codecs/test-codec-g721/test-codec-g721.ino @@ -10,12 +10,12 @@ */ #include "AudioTools.h" #include "AudioCodecs/CodecG7xx.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(8000, 1, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); EncodedAudioStream decoder(&out, new G721Decoder()); // encode and write EncodedAudioStream encoder(&decoder, new G721Encoder()); // encode and write StreamCopy copier(encoder, sound); diff --git a/examples/tests/codecs/test-codec-g722/test-codec-g722.ino b/examples/tests/codecs/test-codec-g722/test-codec-g722.ino index eca199b38..6c7534783 100644 --- a/examples/tests/codecs/test-codec-g722/test-codec-g722.ino +++ b/examples/tests/codecs/test-codec-g722/test-codec-g722.ino @@ -10,12 +10,12 @@ */ #include "AudioTools.h" #include "AudioCodecs/CodecG722.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(24000, 1, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); EncodedAudioStream decoder(&out, new G722Decoder()); // encode and write EncodedAudioStream encoder(&decoder, new G722Encoder()); // encode and write StreamCopy copier(encoder, sound); diff --git a/examples/tests/codecs/test-codec-g723_24/test-codec-g723_24.ino b/examples/tests/codecs/test-codec-g723_24/test-codec-g723_24.ino index cc88c58a1..faaee45fc 100644 --- a/examples/tests/codecs/test-codec-g723_24/test-codec-g723_24.ino +++ b/examples/tests/codecs/test-codec-g723_24/test-codec-g723_24.ino @@ -10,12 +10,12 @@ */ #include "AudioTools.h" #include "AudioCodecs/CodecG7xx.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(8000, 1, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); EncodedAudioStream decoder(&out, new G723_24Decoder()); // encode and write EncodedAudioStream encoder(&decoder, new G723_24Encoder()); // encode and write StreamCopy copier(encoder, sound); diff --git a/examples/tests/codecs/test-codec-g723_40/test-codec-g723_40.ino b/examples/tests/codecs/test-codec-g723_40/test-codec-g723_40.ino index 3197079ba..8f631960f 100644 --- a/examples/tests/codecs/test-codec-g723_40/test-codec-g723_40.ino +++ b/examples/tests/codecs/test-codec-g723_40/test-codec-g723_40.ino @@ -10,12 +10,12 @@ */ #include "AudioTools.h" #include "AudioCodecs/CodecG7xx.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(8000, 1, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); EncodedAudioStream decoder(&out, new G723_40Decoder()); // encode and write EncodedAudioStream encoder(&decoder, new G723_40Encoder()); // encode and write StreamCopy copier(encoder, sound); diff --git a/examples/tests/codecs/test-codec-gsm/test-codec-gsm.ino b/examples/tests/codecs/test-codec-gsm/test-codec-gsm.ino index 444a26dad..5ccb0deb2 100644 --- a/examples/tests/codecs/test-codec-gsm/test-codec-gsm.ino +++ b/examples/tests/codecs/test-codec-gsm/test-codec-gsm.ino @@ -10,12 +10,12 @@ */ #include "AudioTools.h" #include "AudioCodecs/CodecGSM.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(8000, 1, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); EncodedAudioStream decoder(&out, new GSMDecoder()); // encode and write EncodedAudioStream encoder(&decoder, new GSMEncoder()); // encode and write StreamCopy copier(encoder, sound); diff --git a/examples/tests/codecs/test-codec-iLBC/test-codec-iLBC.ino b/examples/tests/codecs/test-codec-iLBC/test-codec-iLBC.ino index 74a7e628a..b5d670ee3 100644 --- a/examples/tests/codecs/test-codec-iLBC/test-codec-iLBC.ino +++ b/examples/tests/codecs/test-codec-iLBC/test-codec-iLBC.ino @@ -10,12 +10,12 @@ */ #include "AudioTools.h" #include "AudioCodecs/CodecILBC.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(8000, 1, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); EncodedAudioStream decoder(&out, new ILBCDecoder()); // encode and write EncodedAudioStream encoder(&decoder, new ILBCEncoder()); // encode and write StreamCopy copier(encoder, sound); diff --git a/examples/tests/codecs/test-codec-l8/test-codec-l8.ino b/examples/tests/codecs/test-codec-l8/test-codec-l8.ino index b1f14d274..a11ca27ae 100644 --- a/examples/tests/codecs/test-codec-l8/test-codec-l8.ino +++ b/examples/tests/codecs/test-codec-l8/test-codec-l8.ino @@ -10,12 +10,12 @@ */ #include "AudioTools.h" #include "AudioCodecs/CodecL8.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(24000, 1, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); //I2SStream out; //CsvOutput out(Serial,channels); EncodedAudioStream decoder(&out, new DecoderL8()); // encode and write diff --git a/examples/tests/codecs/test-codec-lc3/test-codec-lc3.ino b/examples/tests/codecs/test-codec-lc3/test-codec-lc3.ino index 0f01244b9..d04b9e869 100644 --- a/examples/tests/codecs/test-codec-lc3/test-codec-lc3.ino +++ b/examples/tests/codecs/test-codec-lc3/test-codec-lc3.ino @@ -10,12 +10,12 @@ */ #include "AudioTools.h" #include "AudioCodecs/CodecLC3.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(24000, 1, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); //I2SStream out; //CsvOutput out(Serial,channels); EncodedAudioStream decoder(&out, new LC3Decoder()); // encode and write diff --git a/examples/tests/codecs/test-codec-opus/test-codec-opus.ino b/examples/tests/codecs/test-codec-opus/test-codec-opus.ino index 61a324faf..6aa9cb34b 100644 --- a/examples/tests/codecs/test-codec-opus/test-codec-opus.ino +++ b/examples/tests/codecs/test-codec-opus/test-codec-opus.ino @@ -9,13 +9,13 @@ * */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioCodecs/CodecOpus.h" AudioInfo info(24000, 1, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); OpusAudioDecoder dec; OpusAudioEncoder enc; EncodedAudioStream decoder(&out, &dec); // encode and write diff --git a/examples/tests/codecs/test-codec-opusogg/test-codec-opusogg.ino b/examples/tests/codecs/test-codec-opusogg/test-codec-opusogg.ino index f0c277ca7..a1ecbb1ed 100644 --- a/examples/tests/codecs/test-codec-opusogg/test-codec-opusogg.ino +++ b/examples/tests/codecs/test-codec-opusogg/test-codec-opusogg.ino @@ -9,13 +9,13 @@ * */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioCodecs/CodecOpusOgg.h" AudioInfo info(24000, 1, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); //CsvOutput out(Serial); OpusOggEncoder enc; OpusOggDecoder dec; diff --git a/examples/tests/codecs/test-codec-sbc/test-codec-sbc.ino b/examples/tests/codecs/test-codec-sbc/test-codec-sbc.ino index e570ae879..5c4e148c6 100644 --- a/examples/tests/codecs/test-codec-sbc/test-codec-sbc.ino +++ b/examples/tests/codecs/test-codec-sbc/test-codec-sbc.ino @@ -10,12 +10,12 @@ */ #include "AudioTools.h" #include "AudioCodecs/CodecSBC.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(44100, 2, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); EncodedAudioStream decoder(&out, new SBCDecoder()); // encode and write EncodedAudioStream encoder(&decoder, new SBCEncoder()); // encode and write StreamCopy copier(encoder, sound); diff --git a/examples/tests/codecs/test-container-binary-meta/test-container-binary-meta.ino b/examples/tests/codecs/test-container-binary-meta/test-container-binary-meta.ino index 563113bc1..8f5d80582 100644 --- a/examples/tests/codecs/test-container-binary-meta/test-container-binary-meta.ino +++ b/examples/tests/codecs/test-container-binary-meta/test-container-binary-meta.ino @@ -13,7 +13,7 @@ #include "AudioTools.h" #include "AudioCodecs/CodecOpus.h" #include "AudioCodecs/ContainerBinary.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" struct MetaData { MetaData(const char* typeArg, float vol) { @@ -46,7 +46,7 @@ void metaCallback(uint8_t* data, int len) { AudioInfo info(8000, 1, 16); SineWaveGenerator sineWave(32000); GeneratedSoundStream sound(sineWave); -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); BinaryContainerDecoder cont_dec(new OpusAudioDecoder()); BinaryContainerEncoder cont_enc(new OpusAudioEncoder()); EncodedAudioStream decoder(&out, &cont_dec); diff --git a/examples/tests/codecs/test-container-binary/test-container-binary.ino b/examples/tests/codecs/test-container-binary/test-container-binary.ino index 11cd5a930..87511dad7 100644 --- a/examples/tests/codecs/test-container-binary/test-container-binary.ino +++ b/examples/tests/codecs/test-container-binary/test-container-binary.ino @@ -11,12 +11,12 @@ #include "AudioTools.h" #include "AudioCodecs/ContainerBinary.h" #include "AudioCodecs/CodecOpus.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(8000,1,16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); EncodedAudioStream decoder(&out, new BinaryContainerDecoder(new OpusAudioDecoder())); EncodedAudioStream encoder(&decoder, new BinaryContainerEncoder(new OpusAudioEncoder())); StreamCopy copier(encoder, sound); diff --git a/examples/tests/codecs/test-container-ogg/test-container-ogg.ino b/examples/tests/codecs/test-container-ogg/test-container-ogg.ino index b9c0b20be..9d2eba16d 100644 --- a/examples/tests/codecs/test-container-ogg/test-container-ogg.ino +++ b/examples/tests/codecs/test-container-ogg/test-container-ogg.ino @@ -11,12 +11,12 @@ #include "AudioTools.h" #include "AudioCodecs/ContainerOgg.h" #include "AudioCodecs/CodecSBC.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(16000, 1, 16); SineWaveGenerator sineWave( 32000); // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound( sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); OggContainerEncoder enc(new SBCEncoder()); OggContainerDecoder dec(new SBCDecoder()); //OggContainerEncoder enc; diff --git a/examples/tests/codecs/test-mp3-helix-reading/test-mp3-helix-reading.ino b/examples/tests/codecs/test-mp3-helix-reading/test-mp3-helix-reading.ino index 3d0fdc9d6..56b0794a6 100644 --- a/examples/tests/codecs/test-mp3-helix-reading/test-mp3-helix-reading.ino +++ b/examples/tests/codecs/test-mp3-helix-reading/test-mp3-helix-reading.ino @@ -5,13 +5,13 @@ // install https://github.com/pschatzmann/arduino-libhelix.git #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioCodecs/CodecMP3Helix.h" #include "BabyElephantWalk60_mp3.h" MemoryStream mp3(BabyElephantWalk60_mp3, BabyElephantWalk60_mp3_len); //CsvOutput out(Serial,2); -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); EncodedAudioStream pcm_source(&mp3, new MP3DecoderHelix()); // output to decoder StreamCopy copier(out, pcm_source); diff --git a/examples/tests/codecs/test-mp3-helix/test-mp3-helix.ino b/examples/tests/codecs/test-mp3-helix/test-mp3-helix.ino index 63e9a5b84..4373de226 100644 --- a/examples/tests/codecs/test-mp3-helix/test-mp3-helix.ino +++ b/examples/tests/codecs/test-mp3-helix/test-mp3-helix.ino @@ -5,13 +5,13 @@ // install https://github.com/pschatzmann/arduino-libhelix.git #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioCodecs/CodecMP3Helix.h" #include "BabyElephantWalk60_mp3.h" MemoryStream mp3(BabyElephantWalk60_mp3, BabyElephantWalk60_mp3_len); //CsvOutput out(Serial,2); -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); EncodedAudioStream decoder(&out, new MP3DecoderHelix()); // output to decoder StreamCopy copier(decoder, mp3); diff --git a/examples/tests/codecs/test-mp3-mad/test-mp3-mad.ino b/examples/tests/codecs/test-mp3-mad/test-mp3-mad.ino index 564d21ede..c03668ea9 100644 --- a/examples/tests/codecs/test-mp3-mad/test-mp3-mad.ino +++ b/examples/tests/codecs/test-mp3-mad/test-mp3-mad.ino @@ -5,13 +5,13 @@ // install https://github.com/pschatzmann/arduino-libhelix.git #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "AudioCodecs/CodecMP3MAD.h" #include "BabyElephantWalk60_mp3.h" MemoryStream mp3(BabyElephantWalk60_mp3, BabyElephantWalk60_mp3_len); //CsvOutput out(Serial,2); -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); EncodedAudioStream decoder(&out, new MP3DecoderMAD()); // output to decoder StreamCopy copier(decoder, mp3); diff --git a/examples/tests/communications/hdlc/hdlc.ino b/examples/tests/communications/hdlc/hdlc.ino index 9b43325a4..7cf927735 100644 --- a/examples/tests/communications/hdlc/hdlc.ino +++ b/examples/tests/communications/hdlc/hdlc.ino @@ -1,9 +1,9 @@ #include "AudioTools.h" #include "Communication/HDLCStream.h" -// #include "AudioLibs/AudioKit.h" +// #include "AudioLibs/AudioBoardStream.h" AudioInfo info(44000, 2, 16); -I2SStream out; // or AudioKitStream +I2SStream out; // or AudioBoardStream SineWaveGenerator sineWave(32000); GeneratedSoundStream sound(sineWave); QueueStream queue(1024,2); // we simulate a connection diff --git a/examples/tests/filters/test-median-filter/test-median-filter.ino b/examples/tests/filters/test-median-filter/test-median-filter.ino index 1885ecf87..ce72b3517 100644 --- a/examples/tests/filters/test-median-filter/test-median-filter.ino +++ b/examples/tests/filters/test-median-filter/test-median-filter.ino @@ -2,7 +2,7 @@ * Test case for MedianFilter */ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(44100, 1, 16); @@ -34,7 +34,7 @@ protected: GeneratedSoundStream testStream(testSound); // Stream generated from sine wave FilteredStream inFiltered(testStream, info.channels); // Defiles the filter as BaseConverter MedianFilter medianFilter; -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); StreamCopy copier(out, inFiltered); //StreamCopy copier(out, testStream); //compare with this diff --git a/examples/tests/performance/mp3-Speed/mp3-Speed.ino b/examples/tests/performance/mp3-Speed/mp3-Speed.ino index 8b2c0f56f..b5936e8c5 100644 --- a/examples/tests/performance/mp3-Speed/mp3-Speed.ino +++ b/examples/tests/performance/mp3-Speed/mp3-Speed.ino @@ -11,7 +11,7 @@ #include "AudioTools.h" #include "AudioLibs/AudioSourceSDFAT.h" #include "AudioCodecs/CodecMP3Helix.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" const char *startFilePath="/"; const char* ext="mp3"; @@ -28,9 +28,6 @@ void setup() { // sd_active is setting up SPI with the right SD pins by calling SPI.begin(PIN_AUDIO_KIT_SD_CARD_CLK, PIN_AUDIO_KIT_SD_CARD_MISO, PIN_AUDIO_KIT_SD_CARD_MOSI, PIN_AUDIO_KIT_SD_CARD_CS); - // convert bytes to samples (frames) - out.setBytesPerSample(2*16); - // setup player player.setDelayIfOutputFull(0); player.setVolume(0.1); diff --git a/examples/tests/performance/mp3-SynchronizedBufferRTOS/mp3-SynchronizedBufferRTOS.ino b/examples/tests/performance/mp3-SynchronizedBufferRTOS/mp3-SynchronizedBufferRTOS.ino index dd84af838..afe15b215 100644 --- a/examples/tests/performance/mp3-SynchronizedBufferRTOS/mp3-SynchronizedBufferRTOS.ino +++ b/examples/tests/performance/mp3-SynchronizedBufferRTOS/mp3-SynchronizedBufferRTOS.ino @@ -11,7 +11,7 @@ #include "AudioTools.h" #include "AudioLibs/AudioSourceSDFAT.h" #include "AudioCodecs/CodecMP3Helix.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "freertos-all.h" const int buffer_count = 30; diff --git a/examples/tests/performance/mp3-SynchronizedNBuffer/mp3-SynchronizedNBuffer.ino b/examples/tests/performance/mp3-SynchronizedNBuffer/mp3-SynchronizedNBuffer.ino index bc0378cd6..427c41d5d 100644 --- a/examples/tests/performance/mp3-SynchronizedNBuffer/mp3-SynchronizedNBuffer.ino +++ b/examples/tests/performance/mp3-SynchronizedNBuffer/mp3-SynchronizedNBuffer.ino @@ -11,7 +11,7 @@ #include "AudioTools.h" #include "AudioLibs/AudioSourceSDFAT.h" #include "AudioCodecs/CodecMP3Helix.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "freertos-all.h" const int buffer_count = 30; diff --git a/examples/tests/performance/mp3-SynchronizedRingBuffer/mp3-SynchronizedRingBuffer.ino b/examples/tests/performance/mp3-SynchronizedRingBuffer/mp3-SynchronizedRingBuffer.ino index 981fd18d2..81b0ff3b3 100644 --- a/examples/tests/performance/mp3-SynchronizedRingBuffer/mp3-SynchronizedRingBuffer.ino +++ b/examples/tests/performance/mp3-SynchronizedRingBuffer/mp3-SynchronizedRingBuffer.ino @@ -11,7 +11,7 @@ #include "AudioTools.h" #include "AudioLibs/AudioSourceSDFAT.h" #include "AudioCodecs/CodecMP3Helix.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "freertos-all.h" const int buffer_count = 30; diff --git a/examples/tests/sd/test-index-sd/test-index-sd.ino b/examples/tests/sd/test-index-sd/test-index-sd.ino index 25d79f45f..50c26ccc4 100644 --- a/examples/tests/sd/test-index-sd/test-index-sd.ino +++ b/examples/tests/sd/test-index-sd/test-index-sd.ino @@ -1,6 +1,6 @@ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #include "FS.h" #include "SD.h" #include "SPI.h" diff --git a/examples/tests/sd/test-index-sdfat/test-index-sdfat.ino b/examples/tests/sd/test-index-sdfat/test-index-sdfat.ino index 263f42fb3..9ecbf5726 100644 --- a/examples/tests/sd/test-index-sdfat/test-index-sdfat.ino +++ b/examples/tests/sd/test-index-sdfat/test-index-sdfat.ino @@ -1,6 +1,6 @@ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #define USE_SDFAT #include #include diff --git a/examples/tests/sd/test-index-sdmmc/test-index-sdmmc.ino b/examples/tests/sd/test-index-sdmmc/test-index-sdmmc.ino index 263f42fb3..9ecbf5726 100644 --- a/examples/tests/sd/test-index-sdmmc/test-index-sdmmc.ino +++ b/examples/tests/sd/test-index-sdmmc/test-index-sdmmc.ino @@ -1,6 +1,6 @@ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" #define USE_SDFAT #include #include diff --git a/examples/tests/volume/test-panning/test-panning.ino b/examples/tests/volume/test-panning/test-panning.ino index d23a8e74f..e360fdc75 100644 --- a/examples/tests/volume/test-panning/test-panning.ino +++ b/examples/tests/volume/test-panning/test-panning.ino @@ -1,10 +1,10 @@ #include "AudioTools.h" -#include "AudioLibs/AudioKit.h" +#include "AudioLibs/AudioBoardStream.h" AudioInfo info(44100, 2, 32); SineWaveGenerator sineWave; // subclass of SoundGenerator with max amplitude of 32000 GeneratedSoundStream sound(sineWave); // Stream generated from sine wave -AudioKitStream out; +AudioBoardStream out(AudioKitEs8388V1); VolumeStream volume(out); StreamCopy copier(volume, sound); // copies sound into i2s