added partitioning, did 'some' refactoring

Author: cristidragomir97

.vscode/settings.json

@@ -6,6 +6,46 @@
         "unordered_map": "cpp",
         "vector": "cpp",
         "string_view": "cpp",
-        "initializer_list": "cpp"
+        "initializer_list": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "*.tcc": "cpp",
+        "cctype": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "memory": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "random": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "new": "cpp",
+        "numbers": "cpp",
+        "ostream": "cpp",
+        "ranges": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "typeinfo": "cpp"
     }
 }

Arduino_UnifiedStorage_WorkInProgress.ino.elf

@@ -0,0 +1,58 @@
+#include <Arduino.h>
+#include <Arduino_UnifiedStorage.h>
+#include <vector>
+
+      
+
+void testWriting(Arduino_UnifiedStorage * storage){
+    Folder root = storage->getRootFolder();
+    UFile file = root.createFile("file.txt", FileMode::WRITE);
+    file.write("writing stuff to the file");
+    file.changeMode(FileMode::READ);
+    Serial.println("Reading from file: " + file.readAsString());
+    file.close();
+    file.remove();
+}
+
+const char* createPartitionName(int i) {
+    char buffer[20];  // Adjust the size accordingly
+    snprintf(buffer, sizeof(buffer), "Part%d", i);
+    return buffer;
+}
+
+void testAllPartitions(std::vector<Partition> partitions){
+    for (size_t i = 1; i < partitions.size() + 1; ++i) {
+        const char * partitionName = createPartitionName(i);
+        
+        InternalStorage thisPartition = InternalStorage(i, partitionName, partitions[i - 1].fs);
+        if(thisPartition.begin()){
+            Serial.println("Succesfully initialised partition: " + String(partitionName));
+            testWriting(&thisPartition);
+        }
+    }
+}
+
+void setup(){
+
+
+
+    Serial.begin(115200);
+    while(!Serial);
+
+    std::vector<Partition> onePartition = {{16384, FS_LITTLEFS}};
+    InternalStorage::partition(onePartition);
+    testAllPartitions(onePartition);
+    delay(5000);
+
+
+    std::vector<Partition> fourPartitions = {{4096, FS_LITTLEFS}, {4096, FS_LITTLEFS}, {4096, FS_LITTLEFS}, {4096, FS_LITTLEFS}};
+    InternalStorage::partition(fourPartitions);
+    testAllPartitions(fourPartitions);
+    delay(5000);
+  
+}
+
+void loop(){
+
+
+}

examples/AdvancedInternalStorage/AdvancedInternalStorage.ino

@@ -22,16 +22,16 @@ INSTRUCTIONS
 
 #include "Arduino_UnifiedStorage.h"
 #include <vector>
-#include <Output.h>
 
 constexpr auto baudrate { 115200 };
 
 
 #define USB_MOUNTED_LED LED_D0
+#define SUCCESFULLY_COPIED_LED
 
 
 
-InternalStorage internalStorage = InternalStorage();
+InternalStorage internalStorage = InternalStorage(true, "userData", FS_FAT);
 USBStorage usbStorage = USBStorage();
 std::vector<String> sensorDataBuffer;
 
@@ -90,10 +90,10 @@ void performUpdate() {
   backingUP = true;
   unsigned lastUpdateBytes = lastUpdateFile.readAsString().toInt();  // Read the last update size from the file
 
-  printFormatted("Last update bytes: " + String(lastUpdateBytes) + "\n");
+  printToSerialOrRS485("Last update bytes: " + String(lastUpdateBytes) + "\n");
 
   if (lastUpdateBytes >= bytesWritten) {
-    printFormatted("No new data to copy. \n");
+    printToSerialOrRS485("No new data to copy. \n");
     backupFile.close();
     lastUpdateFile.close();
     backingUP = false;
@@ -102,14 +102,14 @@ void performUpdate() {
 
   logFile.seek(lastUpdateBytes);  // Move the file pointer to the last update position
   unsigned long totalBytesToMove = bytesWritten - lastUpdateBytes;
-  printFormatted("New update bytes: " + String(totalBytesToMove) + "\n");
+  printToSerialOrRS485("New update bytes: " + String(totalBytesToMove) + "\n");
 
   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
 
-  printFormatted("Successfully copied " + String(bytesMoved) + " new bytes.");
+  printToSerialOrRS485("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
@@ -130,48 +130,47 @@ void performUpdate() {
 // Function to backup data to USB storage
 void backupToUSB() {
   if (usbAvailable) {
-    printFormatted("USB Mass storage is available \n");
+    printToSerialOrRS485("USB Mass storage is available \n");
     delay(100);
     if (!usbStorage.isMounted()) {
 
-      printFormatted("Mounting USB Mass Storage \n");
+      printToSerialOrRS485("Mounting USB Mass Storage \n");
       digitalWrite(USB_MOUNTED_LED, LOW);
       if(usbStorage.begin()){
         performUpdate();
       } 
 
     } else if (usbStorage.isMounted()) {
-      printFormatted("USB Mass storage is connected, performing update \n");
+      printToSerialOrRS485("USB Mass storage is connected, performing update \n");
       performUpdate();
 
     }
   } else {
-    printFormatted("USB Mass storage is not available \n");
+    printToSerialOrRS485("USB Mass storage is not available \n");
   }
 
-
 }
 
 
 void setup() {
   beginRS485(baudrate);
 
 
-  usbStorage.registerHotplugCallback(connectionCallback);
-  usbStorage.registerUnplugCallback(disconnectionCallback);
+  usbStorage.onConnect(connectionCallback);
+  usbStorage.onDisconnect(disconnectionCallback);
 
   pinMode(USB_MOUNTED_LED, OUTPUT);
-  printFormatted("Formatting internal storage... \n");
+  printToSerialOrRS485("Formatting internal storage... \n");
   int formatted = internalStorage.format(FS_LITTLEFS);
-  printFormatted("QSPI Format status: " + String(formatted) + "\n");
+  printToSerialOrRS485("QSPI Format status: " + String(formatted) + "\n");
 
 
 
   if (!internalStorage.begin()) {
-    printFormatted("Failed to initialize internal storage \n");
+    printToSerialOrRS485("Failed to initialize internal storage \n");
     return;
   } else {
-    printFormatted("Initialized storage \n");
+    printToSerialOrRS485("Initialized storage \n");
   }
 
 }

examples/OptaLogger/OptaLogger.ino

@@ -160,8 +160,8 @@ void setup() {
   Serial.begin(115200);
   while(!Serial);
 
-  usbStorage.registerHotplugCallback(connectionCallback);
-  usbStorage.registerUnplugCallback(disconnectionCallback);
+  usbStorage.onConnect(connectionCallback);
+  usbStorage.onDisconnect(disconnectionCallback);
 
   pinMode(USB_MOUNTED_LED, OUTPUT);
   Serial.print("Formatting internal storage... \n");

examples/PortentaH7Logger/PortentaH7Logger.ino

@@ -19,32 +19,32 @@ void setup() {
 
     internalStorage.format(FS_LITTLEFS);
     internalStorage.begin();
-   
+   c
 
     Folder root = internalStorage.getRootFolder();
 
 
     // Test copyTo
-    printFormatted("Testing copyTo... \n");
+    printToSerialOrRS485("Testing copyTo... \n");
     Folder sourceFolder2 =  root.createSubfolder("source_folder");
-    printFormatted("Folder 1 created \n");
+    printToSerialOrRS485("Folder 1 created \n");
 
-    printFormatted("Trying to create a folder on top of an existing one... without overwrite \n");
+    printToSerialOrRS485("Trying to create a folder on top of an existing one... without overwrite \n");
     Folder sourceFolder3 =  root.createSubfolder("source_folder");
 
-    printFormatted("Trying to create a folder on top of an existing one... with overwrite \n");
+    printToSerialOrRS485("Trying to create a folder on top of an existing one... with overwrite \n");
     Folder sourceFolder4 =  root.createSubfolder("source_folder", true);
 
     Folder destinationFolder2 = root.createSubfolder("destination_folder");
-    printFormatted("Folder 2 created \n");
+    printToSerialOrRS485("Folder 2 created \n");
 
 
 
     bool copyResult = sourceFolder2.copyTo(destinationFolder2, true); // Overwrite if exists
     if (copyResult) {
-        printFormatted("Copy successful \n");
+        printToSerialOrRS485("Copy successful \n");
     } else {
-        printFormatted("Copy failed \n");
+        printToSerialOrRS485("Copy failed \n");
     }
 
 
@@ -54,12 +54,12 @@ void setup() {
     Folder sourceFolder =  root.createSubfolder("source");
     Folder destinationFolder = root.createSubfolder("destination");
 
-    printFormatted("Testing moveTo...  \n");
+    printToSerialOrRS485("Testing moveTo...  \n");
     bool moveResult = sourceFolder.moveTo(destinationFolder, true); // Overwrite if exists
     if (moveResult) {
-        printFormatted("Move successful \n");
+        printToSerialOrRS485("Move successful \n");
     } else {
-        printFormatted("Move failed \n");
+        printToSerialOrRS485("Move failed \n");
     }
 
 
@@ -73,10 +73,10 @@ void setup() {
 
 
     bool success = someFile.copyTo(someOtherFolder);
-    printFormatted("trying to copy file without overwrite: %d\n", success);
+    printToSerialOrRS485("trying to copy file without overwrite: %d\n", success);
 
     success = someFile.copyTo(someOtherFolder,true);
-    printFormatted("trying to copy file with overwrite: %d \n", success);
+    printToSerialOrRS485("trying to copy file with overwrite: %d \n", success);
 
 }