Testing Storage: OK

Author: dhebbeker

lib/storage/storage.cpp

@@ -30,10 +30,10 @@ static const char *const TAG = "STORAGE";
 /**
  * Lists files and directories at path.
  */
-static void listFiles(const char *const dirname)
+static void listFiles(const char *const dirname, const std::shared_ptr<fs::FS> fs)
 {
     std::cout << "Directory: '" << dirname << "'" << std::endl;
-    File root = FFat.open(dirname);
+    File root = fs->open(dirname);
     if (!root || !root.isDirectory())
     {
         ESP_LOGE(TAG, "Error: '%s' is not a directory!\n", dirname);
@@ -75,6 +75,7 @@ class FileSystemSwitcher
     void requestState(const bool fileSystemActive)
     {
         requestFileSystemActive = fileSystemActive;
+        ESP_LOGD(TAG, "request new state: %s", fileSystemActive ? "true" : "false");
         stateChangeRequested.notify_all();
     }
 
@@ -88,6 +89,7 @@ class FileSystemSwitcher
         while (true)
         {
             std::unique_lock fs_state_lock{fileSystemState_mutex};
+            ESP_LOGD(TAG, "waiting for state change request");
             stateChangeRequested.wait(fs_state_lock,
                                       [this]() { return requestFileSystemActive != fileSystemIsActive; });
             if (fileSystemIsActive = requestFileSystemActive)
@@ -96,14 +98,14 @@ class FileSystemSwitcher
                 usbMsc.mediaPresent(false);
                 FFat.end();           // invalidate cache
                 assert(FFat.begin()); // update data
-                listFiles("/");
             }
             else
             {
                 ESP_LOGD(TAG, "unmount FS");
                 FFat.end(); // flush and unmount
                 usbMsc.mediaPresent(true);
             }
+            stateChanged.notify_all();
         }
     }
 
@@ -228,3 +230,9 @@ void Storage::end()
     usbIsRunning = false;
     FFat.end();
 }
+
+void Storage::test()
+{
+    auto fs_p = fileSystemSwitcher.getFileSystem_locking();
+    listFiles("/", fs_p);
+}

lib/storage/storage.hpp

@@ -5,5 +5,6 @@ struct Storage
 {
     static void begin();
     static void end();
+    static void test();
     static std::size_t size();
 };

src/main.cpp

@@ -1,8 +1,12 @@
 #include <Arduino.h>
+#include <chrono>
 #include <esp32-hal-log.h>
 #include <esp_err.h>
 #include <iostream>
 #include <storage.hpp>
+#include <thread>
+
+using namespace std::chrono_literals;
 
 #if ARDUINO_USB_CDC_ON_BOOT == 1
 #define HWSerial Serial0
@@ -16,7 +20,7 @@ void setup()
 {
     HWSerial.begin(115200);
     HWSerial.setDebugOutput(true);
-    delay(300); // in order to give the serial monitor time to start
+    delay(3000); // in order to give the serial monitor time to start
     std::cout << "Started program" << std::endl;
     ESP_LOGE(TAG, "Example error");
     ESP_LOGW(TAG, "Example warning");
@@ -28,11 +32,6 @@ void setup()
 
 void loop()
 {
-    // put your main code here, to run repeatedly:
-    static uint32_t lastTrigger = 0;
-    if (millis() - lastTrigger > 1000)
-    {
-        std::cout << "." << std::flush;
-        lastTrigger = millis();
-    }
+    Storage::test();
+    std::this_thread::sleep_for(3s);
 }