VS1053 sdfat

Author: pschatzmann

examples/examples-vs1053/player-sdfat-vs1053/player-sdfat-vs1053.ino

@@ -0,0 +1,51 @@
+/**
+ * @file player-sdfat-vs1053.ino
+ * @brief Audio player which sends the output to a VS1053 module. Using a module with built in SD card
+ * 
+ * @author Phil Schatzmann
+ * @copyright GPLv3
+ */
+
+// install https://github.com/pschatzmann/arduino-vs1053.git
+// install https://github.com/greiman/SdFat
+
+#include "AudioTools.h"
+#include "AudioLibs/VS1053Stream.h"
+#include "AudioLibs/AudioSourceSDFAT.h"
+#include "AudioCodecs/CodecCopy.h"
+
+const char *startFilePath="/";
+const char* ext="mp3";
+AudioSouSdSpiConfig sd_cfg(PIN_CS, SHARED_SPI, SPI_CLOCK);
+AudioSourceSDFAT source(startFilePath, ext, cfg);
+VS1053Stream vs1053; // final output
+AudioPlayer player(source, vs1053, *new CopyDecoder());
+
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Info);
+
+  // setup output
+  auto cfg = vs1053.defaultConfig();
+  cfg.is_encoded_data = true; // vs1053 is accepting encoded data
+  // Use your custom pins or define in AudioCodnfig.h
+  //cfg.cs_pin = VS1053_CS; 
+  //cfg.dcs_pin = VS1053_DCS;
+  //cfg.dreq_pin = VS1053_DREQ;
+  //cfg.reset_pin = VS1053_RESET;
+  vs1053.begin(cfg);
+  vs1053.setVolume(1.0); // full volume 
+
+  // setup player
+  player.begin();
+
+  // select file with setPath() or setIndex()
+  //player.setPath("/ZZ Top/Unknown Album/Lowrider.mp3");
+  //player.setIndex(1); // 2nd file
+
+}
+
+void loop() {
+  player.copy();
+}

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

@@ -26,7 +26,7 @@ void setup(){
   AudioLogger::instance().begin(Serial, AudioLogger::Warning); // Info is causing a lot of noise  
 
   // Setup sine wave
-  sineWave.begin(channels, sample_rate, N_A4);
+  sineWave.begin(info, N_A4);
 
   // setup output
   auto cfg = out.defaultConfig();

src/AudioCodecs/AudioEncoded.h

@@ -367,7 +367,7 @@ class EncodedAudioOutput : public AudioStream {
 
   /// encodeor decode the data
   virtual size_t write(const uint8_t *data, size_t len) override {
-    LOGD("EncodedAudioOutput::write: %zu", len);
+    LOGD("EncodedAudioOutput::write: %d", (int)len);
     if (len == 0) {
       LOGI("write: %d", 0);
       return 0;
@@ -379,6 +379,7 @@ class EncodedAudioOutput : public AudioStream {
     }
 
     size_t result = writer_ptr->write(data, len);
+    LOGD("EncodedAudioOutput::write: %d -> %d", (int)len, (int)result);
     return result;
   }
 

src/AudioCodecs/CodecCopy.h

@@ -36,7 +36,10 @@ class CopyDecoder : public AudioDecoder {
 
   AudioInfo audioInfo() { AudioInfo dummy; return dummy; }
 
-  size_t write(const void *data, size_t len) { return pt_print->write((uint8_t*)data,len); }
+  size_t write(const void *data, size_t len) { 
+    TRACED();
+    return pt_print->write((uint8_t*)data,len);
+  }
 
   operator bool() { return true; }
 

src/AudioConfig.h

@@ -610,7 +610,7 @@ using WiFiServerSecure = BearSSL::WiFiServerSecure;
 #define VS1053_DEFINED
 #define PIN_CS 9
 
-#ifdef ARDUINO
+#if defined(ARDUINO) && !defined(ARDUINO_MINIMA)
 #  define USE_WIFI
 #  define USE_URL_ARDUINO
 #  define USE_AUDIO_SERVER

src/AudioLibs/AudioSourceSDFAT.h

@@ -48,12 +48,12 @@ namespace audio_tools {
 class AudioSourceSDFAT : public AudioSource {
 public:
   /// Default constructor
-  AudioSourceSDFAT(const char* startFilePath = "/", const char* ext = ".mp3", int chipSelect = PIN_CS, int speedMHz = 2, bool setupIndex=true) {
+  AudioSourceSDFAT(const char* startFilePath = "/", const char* ext = ".mp3", int chipSelect = PIN_CS, int speedMHz = 2,int spi_mode=DEDICATED_SPI, bool setupIndex=true) {
         TRACED();
         LOGI("SD chipSelect: %d", chipSelect);
         LOGI("SD speedMHz: %d", speedMHz);
         LOGI("ext: %s", ext);
-        p_cfg = new SdSpiConfig(chipSelect, DEDICATED_SPI, SD_SCK_MHZ(speedMHz));
+        p_cfg = new SdSpiConfig(chipSelect, spi_mode, SD_SCK_MHZ(speedMHz));
         owns_cfg = true;
         start_path = startFilePath;
         exension = ext;

src/AudioLibs/VS1053Stream.h

@@ -60,7 +60,11 @@ class VS1053Stream : public AudioStream {
             p_VS1053 = vs;
         }
         size_t write(const uint8_t *buffer, size_t size) override { 
-            if (p_VS1053==nullptr) return 0;
+            if (p_VS1053==nullptr) {
+                LOGE("NPE");
+                return 0;
+            }
+            TRACED();
             p_VS1053->playChunk((uint8_t*)buffer, size);
             return size;
         }
@@ -224,8 +228,12 @@ class VS1053Stream : public AudioStream {
     }
 
     /// Write audio data
-    virtual size_t write(const uint8_t *buffer, size_t size) override{ 
-        if (p_out==nullptr) return 0;
+    virtual size_t write(const uint8_t *buffer, size_t size) override { 
+        TRACED();
+        if (p_out==nullptr) {
+            LOGE("NPE");
+            return 0;
+        }
         return p_out->write(buffer, size);
     }
 

src/AudioTools/StreamCopy.h

@@ -138,17 +138,21 @@ class StreamCopyT {
                 #ifndef COPY_LOG_OFF
                 LOGI("StreamCopy::copy %u -> %u -> %u bytes - in %u hops", (unsigned int)bytes_to_read,(unsigned int) bytes_read, (unsigned int)result, (unsigned int)delayCount);
                 #endif
+                TRACED();
 
                 if (result==0){
-                    // give the processor some time 
+                    TRACED();
+                // give the processor some time 
                     delay(delay_on_no_data);
                 }
 
+                TRACED();
                 CHECK_MEMORY();
             } else {
                 // give the processor some time 
                 delay(delay_on_no_data);
             }
+            TRACED();
             return result;
         }