From 45dfe0cfe0e6016bf9bb5d8135114b2c94743546 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Sun, 21 Aug 2022 15:26:29 +0200 Subject: [PATCH] Don't read all dirs at startup. --- include/playlist_manager.h | 1 - src/esmp3.cpp | 3 ++- src/playlist_manager.cpp | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/playlist_manager.h b/include/playlist_manager.h index f8f5b31..ab07ad2 100644 --- a/include/playlist_manager.h +++ b/include/playlist_manager.h @@ -13,7 +13,6 @@ class PlaylistManager { public: PlaylistManager(); - std::vector dirs; std::map map; Playlist get_playlist(String rfid_id); bool has_playlist(String rfid_id); diff --git a/src/esmp3.cpp b/src/esmp3.cpp index 96dfa3e..b69b2b5 100644 --- a/src/esmp3.cpp +++ b/src/esmp3.cpp @@ -22,6 +22,7 @@ MFRC522* rfid; void setup() { pinMode(PIN_CS_SD, OUTPUT); digitalWrite(PIN_CS_SD, HIGH); pinMode(PIN_CS_RFID, OUTPUT); digitalWrite(PIN_CS_RFID, HIGH); + Serial.begin(115200); WiFi.begin("Schlenz", "1410WischlingenPanda"); log_i("Connecting to WiFi..."); @@ -41,7 +42,7 @@ void setup() { Serial.print("Connected to WiFi. IP address: "); Serial.println(WiFi.localIP()); ArduinoOTA.begin(); - Serial.println("Waiting for OTA..."); + log_i("Waiting for OTA..."); for(int i=0; i<20; i++) { ArduinoOTA.handle(); delay(100); diff --git a/src/playlist_manager.cpp b/src/playlist_manager.cpp index 1b4c2ee..9c0f635 100644 --- a/src/playlist_manager.cpp +++ b/src/playlist_manager.cpp @@ -6,6 +6,7 @@ PlaylistManager::PlaylistManager() { SPIMaster::enable_sd(); current_rfid_tag_id = String(""); + /* File root = SD.open("/"); while(File entry = root.openNextFile()) { if (entry.isDirectory()) { @@ -17,6 +18,8 @@ PlaylistManager::PlaylistManager() { } } } + root.close(); + */ if (!SD.exists("/_mapping.txt")) { Serial.println("WARNING: /_mapping.txt not found!"); @@ -37,7 +40,7 @@ PlaylistManager::PlaylistManager() { Serial.printf(" Adding mapping: %s=>%s\n", rfid_id.c_str(), folder.c_str()); map[rfid_id] = folder; - if (folder.charAt(0)=='/') { + /*if (folder.charAt(0)=='/') { bool found=false; for (String f: dirs) { if (f.equals(folder)) { @@ -48,12 +51,11 @@ PlaylistManager::PlaylistManager() { if (!found) { Serial.printf("WARNING: Found mapping for RFID id %s which maps to non-existing folder %s!\n", rfid_id.c_str(), folder.c_str()); } - } + }*/ } } f.close(); } - root.close(); } Playlist PlaylistManager::get_playlist(String rfid_id) {