Skip to content

Commit f4f46ec

Browse files
committed
vs1053
1 parent 796a858 commit f4f46ec

File tree

7 files changed

+24
-8
lines changed

7 files changed

+24
-8
lines changed

examples/examples-vs1053/streams-generator-vs1053/streams-generator-vs1053.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ StreamCopy copier(out, sound); // copy sound to decoder
2525

2626
void setup(){
2727
Serial.begin(115200);
28-
AudioLogger::instance().begin(Serial, AudioLogger::Info);
28+
AudioLogger::instance().begin(Serial, AudioLogger::Warning); // Info is causing a lot of noise
2929

3030
// Setup sine wave
3131
sineWave.begin(channels, sample_rate, N_A4);

examples/examples-vs1053/streams-url_mp3-vs1053/streams-url_mp3-vs1053.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "AudioLibs/VS1053Stream.h"
1515

1616
URLStream url("ssid","password"); // or replace with ICYStream to get metadata
17-
VS1053Stream vs1053(VS1053_CS,VS1053_DCS, VS1053_DREQ); // final output
17+
VS1053Stream vs1053; // final output
1818
StreamCopy copier(vs1053, url); // copy url to decoder
1919

2020
void setup(){

examples/examples-vs1053/basic-a2dp-vs1053/basic-a2dp-vs1053.ino renamed to examples/sandbox/basic-a2dp-vs1053/basic-a2dp-vs1053.ino

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,28 @@ void read_data_stream(const uint8_t *data, uint32_t length) {
2121
out.write(data, length);
2222
}
2323

24+
// Start and Stop VS1053Stream to make sure that WAV header is generated
25+
void audio_state_changed(esp_a2d_audio_state_t state, void *ptr){
26+
Serial.println(a2dp_sink.to_str(state));
27+
switch(state){
28+
case ESP_A2D_AUDIO_STATE_STARTED:
29+
out.begin();
30+
break;
31+
case ESP_A2D_AUDIO_STATE_STOPPED:
32+
case ESP_A2D_AUDIO_STATE_REMOTE_SUSPEND:
33+
out.end();
34+
break;
35+
}
36+
}
37+
38+
2439
void setup() {
2540
Serial.begin(115200);
2641
AudioLogger::instance().begin(Serial, AudioLogger::Warning);
2742

28-
// register callback
43+
// register callbacks
2944
a2dp_sink.set_stream_reader(read_data_stream, false);
45+
a2dp_sink.set_on_audio_state_changed(audio_state_changed);
3046

3147
// Start Bluetooth Audio Receiver
3248
a2dp_sink.set_auto_reconnect(false);

src/AudioConfig.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -431,11 +431,11 @@ typedef uint32_t eps32_i2s_sample_rate_type;
431431
//------ VS1053 ----------
432432

433433
// Default Pins for VS1053
434-
#define VS1053_CS 27
435-
#define VS1053_DCS 14
436-
#define VS1053_DREQ 26
434+
#define VS1053_CS 5
435+
#define VS1053_DCS 16
436+
#define VS1053_DREQ 4
437437
#define VS1053_RESET -1
438-
#define VS1053_CS_SD 13
438+
#define VS1053_CS_SD -1
439439

440440
// use 0 for https://github.com/baldram/ESP_VS1053_Library
441441
// use 1 for https://github.com/pschatzmann/arduino-vs1053

src/AudioLibs/VS1053Stream.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ class VS1053Stream : public AudioStreamX {
248248
p_driver = new VS1053BaseStream(cfg.cs_pin,cfg.dcs_pin,cfg.dreq_pin, cfg.reset_pin, cfg.is_start_spi);
249249
}
250250
if (p_out==nullptr){
251-
AudioEncoder *p_enc = cfg.is_encoded_data ? p_encoder :©
251+
AudioEncoder *p_enc = cfg.is_encoded_data ? &copy:p_encoder;
252252
p_out = new EncodedAudioStream(p_driver, p_enc);
253253
}
254254

0 commit comments

Comments
 (0)