fixes and tweaks

Author: cristidragomir97

examples/AdvancedUSBInternalOperations/AdvancedUSBInternalOperations.ino

@@ -63,13 +63,13 @@ void setup() {
   while (!Serial);
 
   // Mount the USB storage
-  if(usbStorage.begin(FS_FAT)){
+  if(usbStorage.begin()){
     Serial.println("USB storage mounted.");
   } else {
     Serial.println(errno);
   }
 
-  if(internalStorage.begin(FS_FAT)){
+  if(internalStorage.begin()){
       Serial.println("Internal storage mounted.");
   } else {
      Serial.println(errno);

examples/BackupInternalPartitions/BackupInternalPartitions.ino

@@ -89,22 +89,14 @@ void setup(){
     Serial.begin(115200);
     while(!Serial);
 
-    thumbDrive.onConnect(onConnected);
-
-    Serial.println("Waiting for a USB thumb drive to be plugged in...");
-
-}
-
-
-void loop(){
-    if(connected && !done){
-        Serial.println("USB Thumb Drive has been inserted");
+    Serial.println("USB Thumb Drive has been inserted");
         bool thumbMounted = thumbDrive.begin(FS_FAT);
         if(thumbMounted){
             Serial.println("USB Thumb Drive has been mounted");
 
             Folder thumbRoot = thumbDrive.getRootFolder();
             String folderName = "InternalBackup_" + String(millis());
+            Serial.println(folderName);
             Folder backupFolder = thumbRoot.createSubfolder(folderName);
 
             int partitionIndex = 0;
@@ -132,9 +124,15 @@ void loop(){
             }
 
             thumbDrive.unmount();
-            done = true;
+     
 
             Serial.println("DONE, you can restart the board now");
         }
-    }
+
+
+}
+
+
+void loop(){
+
 }

examples/InternalStoragePartitioning/InternalStoragePartitioning.ino

@@ -36,7 +36,7 @@
 #include <vector>
 
 // Create a vector of partitions with one partition of 16MB using LittleFS
-std::vector<Partition> partitioningScheme  = {{2048, FS_FAT}, {6144, FS_FAT} {8192, FS_LITTLEFS}};
+std::vector<Partition> partitioningScheme  = {{2048, FS_FAT}, {6144, FS_FAT}, {8192, FS_LITTLEFS}};
 
 
 // Function to test writing to a file in the specified storage partition
@@ -64,7 +64,7 @@ void testAllPartitions(std::vector<Partition> partitions) {
         const char *partitionName = createPartitionName(i);
 
         // Create an InternalStorage object for the partition
-        InternalStorage thisPartition = InternalStorage(i, partitionName, partitions[i - 1].fileSystem);
+        InternalStorage thisPartition = InternalStorage(i, partitionName, partitions[i - 1].fileSystemType);
 
         // Check if the partition can be mounted
         if (thisPartition.begin()) {
@@ -90,7 +90,7 @@ void listPartitions(){
         partitionIndex ++;
         Serial.println("Partition " + String(partitionIndex));
         Serial.println("\t * Size: " + String(partition.size));
-        Serial.println("\t * Type: " + prettyPrintFileSystemType(partitions.fileSystem));
+        Serial.println("\t * Type: " + prettyPrintFileSystemType(partition.fileSystemType));
         Serial.println();
     }
 }

examples/Logger/Logger.ino

@@ -21,9 +21,8 @@
     So as long as the status LED is off you can safely remove the drive. 
     The sketch will log to internal storage in the meantime, and wait for the USB drive to be inserted again. 
 */
-
+#define ARDUINO_UNIFIED_STORAGE_DEBUG
 #include "Arduino_UnifiedStorage.h"
-#include "Logger.h"
 #include <vector>
 
 
@@ -98,10 +97,10 @@ void performUpdate() {
   backingUP = true;
   unsigned lastUpdateBytes = lastUpdateFile.readAsString().toInt();  // Read the last update size from the file
 
-  printlnToSerialOrRS485("Last update bytes: " + String(lastUpdateBytes));
+  debugPrint("Last update bytes: " + String(lastUpdateBytes));
 
   if (lastUpdateBytes >= bytesWritten) {
-    printlnToSerialOrRS485("No new data to copy. ");
+    debugPrint("No new data to copy. ");
     backupFile.close();
     lastUpdateFile.close();
     backingUP = false;
@@ -110,14 +109,14 @@ void performUpdate() {
 
   logFile.seek(lastUpdateBytes);  // Move the file pointer to the last update position
   unsigned long totalBytesToMove = bytesWritten - lastUpdateBytes;
-  printlnToSerialOrRS485("New update bytes: " + String(totalBytesToMove));
+  debugPrint("New update bytes: " + String(totalBytesToMove));
 
   uint8_t* buffer = new uint8_t[totalBytesToMove];
 
   size_t bytesRead = logFile.read(buffer, totalBytesToMove);
   size_t bytesMoved = backupFile.write(buffer, bytesRead);  // Only write the bytes that haven't been backed up yet
 
-  printlnToSerialOrRS485("Successfully copied " + String(bytesMoved) + " new bytes. ");
+  debugPrint("Successfully copied " + String(bytesMoved) + " new bytes. ");
 
   lastUpdateFile.changeMode(FileMode::WRITE);  // Open the last update file in write mode
   lastUpdateFile.write(String(lastUpdateBytes + bytesMoved));  // Update the last update size
@@ -139,32 +138,32 @@ void performUpdate() {
 void backupToUSB() {
   if(usbAvailable && !usbIntialized){
       usbStorage.begin();
-      printlnToSerialOrRS485("First drive insertion, creating folders... ");
+      debugPrint("First drive insertion, creating folders... ");
       Folder usbRoot = usbStorage.getRootFolder();
       String folderName = "LoggerBackup" + String(random(9999));
       backupFolder = usbRoot.createSubfolder(folderName);
-      printlnToSerialOrRS485("Successfully created backup folder: " + backupFolder.getPathAsString());
+      debugPrint("Successfully created backup folder: " + backupFolder.getPathAsString());
       usbStorage.unmount();
       usbIntialized = true;
   }
   else if(usbAvailable && usbIntialized) {
-    printlnToSerialOrRS485("USB Mass storage is available ");
+    debugPrint("USB Mass storage is available ");
     delay(100);
     if (!usbStorage.isMounted()) {
 
-      printlnToSerialOrRS485("Mounting USB Mass Storage ");
+      debugPrint("Mounting USB Mass Storage ");
       digitalWrite(USB_MOUNTED_LED, LOW);
       if(usbStorage.begin()){
         performUpdate();
       } 
 
     } else if (usbStorage.isMounted()) {
-      printlnToSerialOrRS485("USB Mass storage is connected, performing update ");
+      debugPrint("USB Mass storage is connected, performing update ");
       performUpdate();
 
     }
   } else {
-    printlnToSerialOrRS485("USB Mass storage is not available ");
+    debugPrint("USB Mass storage is not available ");
   }
 
 
@@ -186,17 +185,17 @@ void setup() {
   usbStorage.onDisconnect(disconnectionCallback);
 
   pinMode(USB_MOUNTED_LED, OUTPUT);
-  printlnToSerialOrRS485("Formatting internal storage... ");
+  debugPrint("Formatting internal storage... ");
   int formatted = internalStorage.format(FS_LITTLEFS);
-  printlnToSerialOrRS485("QSPI Format status: " + String(formatted));
+  debugPrint("QSPI Format status: " + String(formatted));
 
 
 
   if (!internalStorage.begin()) {
-    printlnToSerialOrRS485("Failed to initialize internal storage ");
+    debugPrint("Failed to initialize internal storage ");
     return;
   } else {
-    printlnToSerialOrRS485("Initialized storage ");
+    debugPrint("Initialized storage ");
   }
 
 }