tests and sketches should run on H7 and C33

Author: cristidragomir97

examples/AdvancedUSBInternalOperations/AdvancedUSBInternalOperations.ino

@@ -27,7 +27,7 @@
 
 // Two instances are made for the USB and internal storage respectively
 USBStorage usbStorage = USBStorage();
-InternalStorage internalStorage = InternalStorage();
+InternalStorage internalStorage = InternalStorage(2, "user");
 
 // Helper function to prints the contents of a folder, including subdirectories (marked as "[D]") and files (marked as "[F]").
 void printFolderContents(Folder dir, int indentation = 0) {

examples/logger/logger.ino renamed to examples/PoftentaH7Logger/PortentaH7Logger.ino

@@ -157,7 +157,11 @@ void setup() {
   while (!Serial);
   pinMode(USB_MOUNTED_LED, OUTPUT);
   Serial.println("Formatting internal storage...");
+  internalStorage.begin();
+  internalStorage.unmount();
   int formatted = internalStorage.format();
+  internalStorage.begin();
+
   Serial.print("QSPI Format status: "); Serial.println(formatted);
 
   //configureRS485(baudrate);
@@ -173,9 +177,9 @@ void setup() {
 }
 
 void loop() {
-  #if defined(ARDUINO_PORTENTA_H7_M7)
-    usbStorage.checkConnection();
-  #endif
+
+  usbStorage.checkConnection();
+  
   runPeriodically(logDataToRAM, 100, &lastLog);
   runPeriodically(moveDataToQSPI, 1000, &lastMove);
   runPeriodically(backupToUSB, 10000, &lastBackup);

examples/SimpleStorageWriteRead/SimpleStorageWriteRead.ino

@@ -23,21 +23,46 @@
 
 #include "Arduino_UnifiedStorage.h"
 
+void printFolderContents(Folder dir, int indentation = 0) {
+  std::vector<Folder> directories = dir.getFolders();
+  std::vector<UFile> files = dir.getFiles();
+
+  // Print directories
+  for (Folder subdir : directories) {
+    for (int i = 0; i < indentation; i++) {
+      Serial.print("  ");
+    }
+    Serial.print("[D] ");
+    Serial.println(subdir.getPath());
+    printFolderContents(subdir, indentation + 1);
+  }
+
+  // Print files
+  for (UFile file : files) {
+    for (int i = 0; i < indentation; i++) {
+      Serial.print("  ");
+    }
+    Serial.print("[F] ");
+    Serial.println(file.getPath());
+  }
+}
+
+
 // Uncomment one of the three lines below to select between SD card, USB or internal storage
 //SDStorage unifiedStorage = SDStorage();             // Create an instance for interacting with SD card storage
 //USBStorage unifiedStorage = USBStorage()            // Create an instance for interacting with USB storage
-InternalStorage unifiedStorage = InternalStorage();   // Create an instance for interacting with internal Flash storage (default)
+InternalStorage internalStorage = InternalStorage(2, "user");  // Create an instance for interacting with internal Flash storage (default)
 
 void setup() {
   Serial.begin(115200);
   while (!Serial);
 
-  if(!unifiedStorage.begin()==0){
+  if(!internalStorage.begin()){
     Serial.println("Error mounting storage device.");
   }
 
   // Create a root directory in storage device
-  Folder root = unifiedStorage.getRootFolder();
+  Folder root = internalStorage.getRootFolder();
 
   // Create subdirectories inside the root directory
   Folder subdir1 = root.createSubfolder("subdir1");
@@ -65,8 +90,9 @@ void setup() {
 
   // Read data from file1
   file1.seek(0); // Move the file pointer to the beginning
+  Serial.println(file1.available());
   while (file1.available()) {
-    char data = file1.read();
+  char data = file1.read();
     Serial.write(data);
   }
   Serial.println();
@@ -75,17 +101,19 @@ void setup() {
   file2.seek(0); // Move the file pointer to the beginning
   while (file2.available()) {
     char data = file2.read();
-    Serial.write(data);
+    Serial.print(data);
   }
   Serial.println();
 
   // Read data from file3
   file3.seek(0); // Move the file pointer to the beginning
   while (file3.available()) {
     char data = file3.read();
-    Serial.write(data);
+    Serial.print(data);
   }
   Serial.println();
+
+  printFolderContents(internalStorage.getRootFolder());
 }
 
 void loop() {

src/Folder.cpp

@@ -105,16 +105,29 @@ String Folder::getPathString() {
 }
 
 Folder Folder::createSubfolder(const char* subfolderName) {
-    // Construct the full path of the subfolder
+    bool alreadyExists = false;
     std::string subfolderPath = this->path + "/" + subfolderName;
 
-    // Create the subfolder
+     for(Folder d: this->getFolders()){
+        if(d.getPath() == subfolderPath){
+            alreadyExists = true;
+
+        }
+    }
+
+    // Construct the full path of the subfolder
+ 
+    if (!alreadyExists){
     int result = mkdir(subfolderPath.c_str(), 0777);
-    if (result == 0) {
-        return Folder(subfolderPath.c_str());
+        if (result == 0) {
+           return Folder(subfolderPath.c_str());
+        } else {
+            return Folder();
+        }
     } else {
-        return Folder(); // Return an empty directory object on failure
+        return Folder(subfolderPath.c_str());
     }
+ 
 }
 
 Folder Folder::createSubfolder(String subfolderName) {

src/USBStorage.cpp

@@ -9,7 +9,7 @@
 USBStorage::USBStorage(){
  #if defined(ARDUINO_PORTENTA_C33)
          register_hotplug_callback(DEV_USB,  [](){
-            available = !available;
+            usb_available = !usb_available;
 
         });
 #endif
@@ -57,7 +57,7 @@ Folder USBStorage::getRootFolder(){
 
 
 bool USBStorage::isAvailable(){
-    return available;
+    return usb_available;
 }
 
 bool USBStorage::isConnected(){
@@ -103,12 +103,12 @@ void USBStorage::checkConnection(){
 
 
                     if ((dev = host->getDevice(0)) != NULL) {
-                         available = true;
+                         usb_available = true;
 
                         uint8_t ceva =  dev->getNbIntf();
                            found = true;
                         } else {
-                             available = false;
+                             usb_available = false;
                         }
     }
 

src/USBStorage.h

@@ -5,7 +5,7 @@
 
 
 
-static bool available = false;
+static bool usb_available = false;
 
 class USBStorage : public Arduino_UnifiedStorage {
     public: