Skip to content

Commit 437e596

Browse files
committed
Support for AudioKit library
1 parent 6c8e305 commit 437e596

File tree

28 files changed

+606
-388
lines changed

28 files changed

+606
-388
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ As “Audio Sources” we will have e.g.:
2727
- Audio generated by STK Framwork - [STKStream](https://pschatzmann.github.io/arduino-audio-tools/html/classaudio__tools_1_1_s_t_k_stream.html)
2828
- Desktop Integration - [PortAudioStream](https://pschatzmann.github.io/arduino-audio-tools/html/classaudio__tools_1_1_port_audio_stream.html)
2929
- A Timer based Source - [TimerCallbackAudioStream](https://pschatzmann.github.io/arduino-audio-tools/html/classaudio__tools_1_1_timer_callback_audio_stream.html)
30+
- ESP32 AudioKit - [AudioKitStream](https://pschatzmann.github.io/arduino-audio-tools/html/classaudio__tools_1_1_audio_kit_stream.html)
3031
- Any other Arduino Classes implementing Streams: SD, Ethernet etc
3132

3233
As “Audio Sinks” we will have e.g:
@@ -40,6 +41,7 @@ As “Audio Sinks” we will have e.g:
4041
- Desktop Integration - [PortAudioStream](https://pschatzmann.github.io/arduino-audio-tools/html/classaudio__tools_1_1_port_audio_stream.html)
4142
- ID3 Metadata for MP3 - [MetaDataID3](https://pschatzmann.github.io/arduino-audio-tools/html/classaudio__tools_1_1_meta_data_i_d3.html)
4243
- A Timer based Sink - [TimerCallbackAudioStream](https://pschatzmann.github.io/arduino-audio-tools/html/classaudio__tools_1_1_timer_callback_audio_stream.html)
44+
- ESP32 AudioKit - [AudioKitStream](https://pschatzmann.github.io/arduino-audio-tools/html/classaudio__tools_1_1_audio_kit_stream.html)
4345
- Callback integration e.g. with ESP8266Audio [AudioOutputWithCallback](https://pschatzmann.github.io/arduino-audio-tools/html/classaudio__tools_1_1_audio_output_with_callback.html)
4446
- Any other Arduino Classes implementing Streams: SD, Ethernet etc
4547

@@ -82,6 +84,7 @@ void loop(){
8284

8385
Further examples can be found in the [Wiki](https://github.com/pschatzmann/arduino-audio-tools/wiki/Examples). The library also provides a versatile [AudioPlayer](https://github.com/pschatzmann/arduino-audio-tools/wiki/The-Audio-Player-Class).
8486

87+
8588
### Logging
8689

8790
The application uses a built in logger (see AudioLogger.h and AudioConfig.h). You can e.g. deactivate the logging by changing USE_AUDIO_LOGGING to false in the AudioConfig.h:
@@ -107,6 +110,7 @@ Dependent on the example you might need to install some of the following librari
107110
- [arduino-fdk-aac](https://github.com/pschatzmann/arduino-fdk-aac) A __AAC Encoder and Decoder__ from the Frauenhofer Institute
108111
- [arduino-libmad](https://github.com/pschatzmann/arduino-libmad) A open source __MP3 Decoder__ from Underbit
109112
- [arduino-liblame](https://github.com/pschatzmann/arduino-liblame) A open source __MP3 Encoder__
113+
- [arduino-audiokit](https://github.com/pschatzmann/arduino-audiokit) Support for the __ESP32 AudioKit__ and ES7148, ES7210, ES7243, ES8311, ES8347, ES8388, TAS5805m decoder chips
110114
- [SdFat Library](https://github.com/greiman/SdFat) to read and write files supporting SD cards with FAT16/FAT32 and exFAT
111115
- [SD Library](https://www.arduino.cc/en/reference/SD) to read and write files supporting SD cards with FAT16 and FAT32
112116
- [SAM](https://github.com/pschatzmann/arduino-SAM) A Text to Speach Engine
File renamed without changes.

examples/examples-basic-api/basic-a2dp-audiokit/basic-a2dp-audiokit.ino renamed to examples/examples-audiokit/basic-a2dp-audiokit/basic-a2dp-audiokit.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#define USE_A2DP
22
#include "AudioTools.h"
3-
#include "AudioDevices/AudioKitESP32/AudioKit.h"
3+
#include "AudioLibs/AudioKitHAL.h"
4+
45

56
BluetoothA2DPSink a2dp_sink;
67
AudioKitStream kit;
@@ -15,7 +16,6 @@ void setup() {
1516

1617
// setup output
1718
auto cfg = kit.defaultConfig(TX_MODE);
18-
cfg.default_volume = 50;
1919
kit.begin(cfg);
2020

2121
// register callback
File renamed without changes.

examples/examples-player/player-sd-audiokit/player-sd-audiokit.ino renamed to examples/examples-audiokit/player-sd-audiokit/player-sd-audiokit.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#define USE_SDFAT
1111
#define USE_HELIX
1212
#include "AudioTools.h"
13-
#include "AudioDevices/AudioKitESP32/AudioKit.h"
13+
#include "AudioLibs/AudioKitHAL.h"
1414

1515
using namespace audio_tools;
1616

File renamed without changes.

examples/examples-player/player-url_icy-audiokit/player-url_icy-audiokit.ino renamed to examples/examples-audiokit/player-url_icy-audiokit/player-url_icy-audiokit.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "AudioTools.h"
1313
#include "AudioCodecs/CodecMP3Helix.h"
14-
#include "AudioDevices/AudioKitESP32/AudioKit.h"
14+
#include "AudioLibs/AudioKitHAL.h"
1515

1616
using namespace audio_tools;
1717

File renamed without changes.

examples/examples-stream/streams-audiokit-csv/streams-audiokit-csv.ino renamed to examples/examples-audiokit/streams-audiokit-csv/streams-audiokit-csv.ino

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010

1111
#include "AudioTools.h"
12-
#include "AudioDevices/AudioKitESP32/AudioKit.h"
12+
#include "AudioLibs/AudioKitHAL.h"
1313

1414
using namespace audio_tools;
1515

@@ -23,12 +23,12 @@ void setup(void) {
2323
AudioLogger::instance().begin(Serial, AudioLogger::Debug);
2424

2525
auto cfg = kit.defaultConfig(RX_MODE);
26-
cfg.input_device = AUDIO_HAL_ADC_INPUT_LINE2;
26+
cfg.adc_input = AUDIO_HAL_ADC_INPUT_LINE2;
2727
cfg.use_apll = true;
2828
kit.begin(cfg);
2929

3030
// make sure that we have the correct channels set up
31-
csvStream.begin(cfg);
31+
csvStream.begin();
3232

3333
}
3434

File renamed without changes.

0 commit comments

Comments
 (0)