SD & SDMMC tests

Author: pschatzmann

examples/tests/sd/test-index-sd/test-index-sd.ino

@@ -4,21 +4,23 @@
 #include "FS.h"
 #include "SD.h"
 #include "SPI.h"
-#include "AudioLibs/AudioSourceIdxSD.h"
+#include "AudioLibs/SDIndex.h"
 
 void setup() {
   Serial.begin(115200);
-  AudioLogger::instance().begin(Serial, AudioLogger::Debug);
+  while(!Serial);
+  AudioLogger::instance().begin(Serial, AudioLogger::Warning);
 
   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);  
   while (!SD.begin(PIN_AUDIO_KIT_SD_CARD_CS)) {
        Serial.println("SD.begin failed");
        delay(1000);
   }
-  AudioSourceSD<fs::SDFS,fs::File> idx{SD};
+  SDIndex<fs::SDFS,fs::File> idx{SD};
   idx.ls(Serial, "/", "mp3","*");
 
 }
 
 void loop() {
+  delay(1000);
 }

examples/tests/sd/test-index-sdfat/test-index-sdfat.ino

@@ -4,7 +4,7 @@
 #define USE_SDFAT
 #include <SPI.h>
 #include <SdFat.h>
-#include "AudioLibs/AudioSourceIndex.h"
+#include "AudioLibs/SDIndex.h"
 #define SD_FAT_TYPE 3
 
 #if SD_FAT_TYPE == 0
@@ -27,21 +27,20 @@ AudioFs sd;
 
 void setup() {
   Serial.begin(115200);
-  AudioLogger::instance().begin(Serial, AudioLogger::Debug);
+  while(!Serial);
+  AudioLogger::instance().begin(Serial, AudioLogger::Warning);
 
   SdSpiConfig cfg(PIN_AUDIO_KIT_SD_CARD_CS, DEDICATED_SPI, SD_SCK_MHZ(2));
   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);  
   while (!sd.begin(cfg)) {
        Serial.println("sd.begin failed");
        delay(1000);
   }
-  // put your setup code here, to run once:
-  AudioSourceSDFAT<AudioFs,AudioFile> idx(sd);
+  SDIndex<AudioFs,AudioFile> idx(sd);
   idx.ls(Serial, "/", "mp3","*");
 
 }
 
 void loop() {
-  // put your main code here, to run repeatedly:
-
+  delay(1000);
 }

examples/tests/sd/test-index-sdmmc/test-index-sdmmc.ino

@@ -4,7 +4,7 @@
 #define USE_SDFAT
 #include <SPI.h>
 #include <SdFat.h>
-#include "AudioLibs/AudioSourceIndex.h"
+#include "AudioLibs/SDIndex.h"
 #define SD_FAT_TYPE 3
 
 #if SD_FAT_TYPE == 0
@@ -27,21 +27,20 @@ AudioFs sd;
 
 void setup() {
   Serial.begin(115200);
-  AudioLogger::instance().begin(Serial, AudioLogger::Debug);
+  while(!Serial);
+  AudioLogger::instance().begin(Serial, AudioLogger::Warning);
 
   SdSpiConfig cfg(PIN_AUDIO_KIT_SD_CARD_CS, DEDICATED_SPI, SD_SCK_MHZ(2));
   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);  
   while (!sd.begin(cfg)) {
        Serial.println("sd.begin failed");
        delay(1000);
   }
-  // put your setup code here, to run once:
-  AudioSourceSDMMC<AudioFs,AudioFile> idx(sd);
+  SDIndex<AudioFs,AudioFile> idx(sd);
   idx.ls(Serial, "/", "mp3","*");
 
 }
 
 void loop() {
-  // put your main code here, to run repeatedly:
-
+  delay(1000);
 }

src/AudioLibs/SDDirect.h

@@ -217,7 +217,7 @@ class SDDirect {
 #ifdef USE_SDFAT
       return f.isHidden();
 #else
-      return Str(f.name()).contains("/.");
+      return Str(fileNamePath(f)).contains("/.");
 #endif
 
     }

src/AudioLibs/SDIndex.h

@@ -271,9 +271,9 @@ class SDIndex {
 
     bool isHidden(FileT f){
 #ifdef USE_SDFAT
-       return f.isHidden();
+      return f.isHidden();
 #else
-      return Str(f.name()).contains("/.");
+      return Str(fileNamePath(f)).contains("/.");
 #endif
 
     }