WIP

Author: dhebbeker

lib/storage/storage.cpp

@@ -1,3 +1,5 @@
+#include <Arduino.h>
+
 #include "storage.hpp"
 #include <FFat.h>
 #include <USB.h>
@@ -7,15 +9,6 @@
 #include <esp_partition.h>
 #include <string>
 
-#if ARDUINO_USB_CDC_ON_BOOT == 1
-#define HWSerial Serial0
-#define USBSerial Serial
-#else
-#define HWSerial Serial
-#include <USBCDC.h>
-USBCDC USBSerial;
-#endif
-
 #if defined(ARDUINO_USB_MODE)
 static_assert(ARDUINO_USB_MODE == 0, "USB must be in OTG mode");
 #endif
@@ -110,7 +103,7 @@ std::size_t Storage::size()
 
 bool Storage::begin(const bool formatFsOnFail, const char *const partitionLabel)
 {
-    ESP_LOGI(TAG, "Starting storage...");
+    ESP_LOGD(TAG, "Starting storage...");
     partition = check_ffat_partition(partitionLabel);
 
     if (!partition)
@@ -129,6 +122,7 @@ bool Storage::begin(const bool formatFsOnFail, const char *const partitionLabel)
     }
     ESP_LOGI(TAG, "Storage has a size of %u bytes.", size());
     ESP_LOGI(TAG, "Storage mounted at '%s'.", basePath.c_str());
+    fileSystemIsReady = true;
 
     // setup USB Mass Storage Class
     usbMsc.vendorID("TTS");        // max 8 chars
@@ -138,14 +132,11 @@ bool Storage::begin(const bool formatFsOnFail, const char *const partitionLabel)
     // Set callback
     usbMsc.onRead(usbMsc_onRead);
     usbMsc.onWrite(usbMsc_onWrite);
-    // usbMsc is ready for read/write
-    usbMsc.mediaPresent(true);
-    if (!usbMsc.begin(FFat.totalBytes() / blockSize, blockSize))
+    if (!usbMsc.begin(size() / blockSize, blockSize))
     {
         ESP_LOGE(TAG, "USB MSC initialization failed!");
         return false;
     }
-    fileSystemIsReady = true;
 
     // subscribe to USB events
     USB.onEvent(ARDUINO_USB_STARTED_EVENT, callbackUsbStarted);

src/main.cpp

@@ -22,12 +22,12 @@ struct TestStorage : Storage
      */
     static void listFiles(const char *const dirname)
     {
-        // auto FFat = getFileSystem();
+        auto FFat = getFileSystem();
         HWSerial.printf("Directory: '%s'\n", dirname);
         File root = FFat.open(dirname);
         if (!root || !root.isDirectory())
         {
-            ESP_LOGE(TAG, "'%s' is not a directory!\n", dirname);
+            ESP_LOGE(TAG, "'%s' is not a directory!", dirname);
             root.close();
             return;
         }
@@ -36,10 +36,12 @@ struct TestStorage : Storage
         while (file)
         {
             HWSerial.printf("  %s (%s, %d Bytes)\n", file.name(), file.isDirectory() ? "d" : "f", file.size());
+            file.close();
             file = root.openNextFile();
         }
         file.close();
         root.close();
+        HWSerial.println("end of directory");
     }
 };