new versions, rfid not yet working

src/main.cpp

@@ -33,7 +33,7 @@
 
 #define BAT_VOLTAGE_PIN 35
 
-#define RFID_LOOP_INTERVAL 30
+#define RFID_LOOP_INTERVAL 25
 
 #define VOLTAGE_LOOP_INTERVAL 5000
 
@@ -364,7 +364,8 @@ bool playFile(const char *filename, uint32_t resumeFilePos)
     Serial.println("filename is empty.");
     return false;
   }
-  return audio.connecttoSD(filename, resumeFilePos);
+  //return audio.connecttoFS(filename, resumeFilePos);
+  return audio.connecttoFS(SD,filename,resumeFilePos);
 }
 
 void playNextMp3()
@@ -392,7 +393,7 @@ void playNextMp3()
   Serial.print("Now advancing to ");
   String mp3File = currentNode->getCurrentPlayingFilePath();
   Serial.println(mp3File.c_str());
-   deactivateRFID();
+  deactivateRFID();
   activateSD();
   playFile(mp3File.c_str());
   activateRFID();
@@ -695,17 +696,18 @@ void setup()
   }
 
 
-  //deactivateSD();
-  //activateRFID();
-  //Serial.println("RFID");
+  deactivateSD();
+  activateRFID();
+  Serial.println("RFID");
 
-  // Init MFRC522
-  // Init SPI bus
+  //Init MFRC522
+  //Init SPI bus
   //SPI.begin(-1, -1, -1, CS_RFID);
-  //rfid.PCD_Init(CS_RFID, RST_RFID);
+  rfid.PCD_Init(CS_RFID, RST_RFID);
 
-/* somehow this test stops rfid from working!
-  if (rfid.PCD_PerformSelfTest())
+ //somehow this test stops rfid from working!
+ /* 
+ if (rfid.PCD_PerformSelfTest())
   {
     Serial.println("RFID OK");
   }