added readPartitions, unified Logger for C33, H7 and opta

Author: cristidragomir97

README.md

@@ -13,20 +13,8 @@ The Arduino_UnifiedStorage library provides a unified interface to access differ
 ## 👀 Instructions
 1. Download and install this library 
 2. Check compatibility with your platform
-3. To use internal storage, you need to make sure it is partitioned and formatted correctly:
-
-### Formatting the Portenta H7 / Portenta Machine Control / Opta Internal Storage
-* Flash the `QSPIFormat` example that can be found in the `STM32H747_System` folder
-* Open the serial monitor and select answer with "n" when this appears "Do you want to use partition scheme 1? Y/[n]"
-* The sketch will warn you that the content of the QSPI flash will be erased. Answer with "Y".
-* When asked if you'd like to use LittleFS on the data partition, select "n". Most of the examples assume that the drive is formatted as FAT. You can use the library to format to LittleFS later. 
-* Reboot the board
- 
-### Formatting the Portenta C33 Internal Storage
-*  Flash the `QSPIFormat` example that can be found in the `Storage` folder for Portenta C33.
-*  Open the Serial Monitor. The sketch will warn you that the content of the QSPI flash will be erased. Answer with "Y".
-*  When asked if you'd like to use LittleFS on the data partition, select "n". Most of the examples assume that the drive is formatted as FAT. You can use the library to format to LittleFS later. 
-*  Reboot the board
+
+
 
 ## ✨ Features
 * Access files and directories on internal storage, SD cards, and USB mass storage devices.
@@ -36,6 +24,7 @@ The Arduino_UnifiedStorage library provides a unified interface to access differ
 * List files and subfolders in a directory.
 * Manipulate files and folders from one storage medium to another
 * Format partitions and drives (FAT and LittleFS)
+* Create and modify partitions on the internal storage
 
 ## Compatibility
 This library has been tested with the following STM32 and Renesas based Arduino boards. The availability of storage mediums depends on the hardware interfaces:

examples/AdvancedInternalStorage/AdvancedInternalStorage.ino

@@ -5,29 +5,38 @@
 
 void testWriting(Arduino_UnifiedStorage * storage){
     Folder root = storage->getRootFolder();
+
     UFile file = root.createFile("file.txt", FileMode::WRITE);
+    Serial.println("\t\t - File path: " + file.getPathAsString());
     file.write("writing stuff to the file");
     file.changeMode(FileMode::READ);
-    Serial.println("Reading from file: " + file.readAsString());
+    Serial.println("\t\t - File contents: " + 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;
+    switch(i){
+        case 1: return "uno";
+        case 2: return "due";
+        case 3: return "tre";
+        case 4: return "quattro";
+        default: return "";
+    }
 }
 
 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);
+        const char * partitionName = createPartitionName(i);    
+        InternalStorage thisPartition = InternalStorage(i, partitionName, partitions[i - 1].fileSystem);
         if(thisPartition.begin()){
-            Serial.println("Succesfully initialised partition: " + String(partitionName));
+            Serial.println("\t - Succesfully mounted partition: /" + String(partitionName));
+            Serial.println("\t - Testing file opperations: ");
             testWriting(&thisPartition);
+
         }
+
+        Serial.println();
     }
 }
 
@@ -38,20 +47,22 @@ void setup(){
     Serial.begin(115200);
     while(!Serial);
 
-    std::vector<Partition> onePartition = {{16384, FS_LITTLEFS}};
+
+    Serial.println("Creating one partition of 16MB: ");
+    std::vector<Partition> onePartition = {{8192, 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);
+    std::vector<Partition> partitions = InternalStorage::readPartitions();
+    for(auto p: partitions){
+        Serial.println("partition size: " + String(p.size));
+        Serial.println("partition type: " + String(p.fileSystem));
+        Serial.println();
+    }
 
 }
 
 void loop(){
-
-
 }

examples/BackupInternalPartitions/BackupInternalPartitions.ino

@@ -70,19 +70,10 @@ void move(Folder * source, Folder * dest){
 }
 
 
-#if defined(ARDUINO_PORTENTA_C33)
-void backupPartitionsC33(Folder * backupFolder){
-
-    Serial.println("* backup location: " + String(backupFolder -> getPathAsString()));
 
-    int otaMounted = ota.begin(FS_FAT);
-    Serial.println("* ota partition mount: " + String(otaMounted));
 
-    int dataMounted = data.begin(FS_FAT);
-    Serial.println("* data partition mount: " + String(dataMounted));
 
-
-    if(otaMounted == 1){
+void backupPartitions(){
         Folder otaRoot = ota.getRootFolder();
         addSomeFakeFiles(&otaRoot);
         Folder otaFolder = backupFolder -> createSubfolder("ota");
@@ -91,66 +82,7 @@ void backupPartitionsC33(Folder * backupFolder){
     } else {
         Serial.println("OTA partition not mounted, cannot proceed");
     }
-
-
-    if(dataMounted == 1){
-        Folder dataRoot = data.getRootFolder();
-        addSomeFakeFiles(&dataRoot); 
-        Folder dataFolder = backupFolder -> createSubfolder("data");
-        move(&dataRoot, &dataFolder);
-        data.unmount();
-    } else {
-        Serial.println("Data partition not mounted, cannot proceed");
-    }
 }
-#endif 
-
-
-#if defined(ARDUINO_PORTENTA_H7_M7)
-void backupPartitionsH7(Folder * backupFolder){
-    Serial.println("* backup location: " + String(backupFolder -> getPathAsString()));
-
-    int wifiMounted = wifi.begin(FS_FAT);
-    Serial.println("* wifi partition mount: " + String(wifiMounted));
-
-    int otaMounted = ota.begin(FS_FAT);
-    Serial.println("* ota partition mount: " + String(otaMounted));
-
-    int dataMounted = data.begin(FS_FAT);
-    Serial.println("* data partition mounted: " + String(dataMounted));
-
-    if(wifiMounted == 1){
-        Folder wifiRoot = wifi.getRootFolder();
-        addSomeFakeFiles(&wifiRoot);
-        Folder wifiFolder = backupFolder -> createSubfolder("wifi");
-        move(&wifiRoot, &wifiFolder);
-        wifi.unmount();
-    } else {
-        Serial.println("WiFi partition not mounted, cannot proceed");
-    }
-
-    if(otaMounted == 1){
-        Folder otaRoot = ota.getRootFolder();
-        addSomeFakeFiles(&otaRoot);
-        Folder otaFolder = backupFolder -> createSubfolder("ota");
-        move(&otaRoot, &otaFolder);
-        ota.unmount();
-    } else {
-        Serial.println("OTA partition not mounted, cannot proceed");
-    }
-
-
-    if(dataMounted == 1){
-        Folder dataRoot = data.getRootFolder();
-        addSomeFakeFiles(&dataRoot); 
-        Folder dataFolder = backupFolder -> createSubfolder("data");
-        move(&dataRoot, &dataFolder);
-        data.unmount();
-    } else {
-        Serial.println("Data partition not mounted, cannot proceed");
-    }
-}
-#endif 
 
 void setup(){
     randomSeed(analogRead(A0));
@@ -167,12 +99,13 @@ void setup(){
     String folderName = "InternalBackup_" + String(millis());
     Folder backupFolder = thumbRoot.createSubfolder(folderName);
 
-
-    #if defined(ARDUINO_PORTENTA_H7_M7)
-        backupPartitionsH7(&backupFolder);
-    #elif defined(ARDUINO_PORTENTA_C33)
-        backupPartitionsC33(&backupFolder);
-    #endif
+    int partitionIndex = 0;
+    for (auto part: InternalStorage::readPartitions()){
+        partitionBackupFolderName = "Part" + String(partitionIndex);
+        backupFolder.createFolder(partitionBackupFolderName);
+        
+        
+    }
 
     thumbDrive.unmount();
 

examples/PortentaH7Logger/PortentaH7Logger.ino renamed to examples/Logger/Logger.ino

@@ -22,19 +22,21 @@ INSTRUCTIONS
 
 #include "Arduino_UnifiedStorage.h"
 #include <vector>
-#include <Output.h>
 
-constexpr auto baudrate { 115200 };
 
 #if defined(ARDUINO_PORTENTA_H7_M7)
 #define USB_MOUNTED_LED LED_BLUE
 #elif defined(ARDUINO_PORTENTA_C33)
 #define USB_MOUNTED_LED LEDB
+#elif defined(ARDUINO_OPTA)
+#define USB_MOUNTED_LED LED_D0
 #endif
 
 
 InternalStorage internalStorage = InternalStorage();
 USBStorage usbStorage = USBStorage();
+Folder backupFolder = Folder();
+bool usbIntialized = false;
 std::vector<String> sensorDataBuffer;
 
 unsigned long bytesWritten = 0;
@@ -47,10 +49,12 @@ volatile bool usbAvailable = false;
 bool backingUP = false;
 
 void connectionCallback(){
+    printToSerialOrRS485("CONNECTION CALLBACK RAISED !!!");
     usbAvailable = true;
 }
 
 void disconnectionCallback(){
+    printToSerialOrRS485("DISCONNECTION CALLBACK RAISED !!!");
     usbAvailable = false;
 }
 // Function to run a given method periodically
@@ -67,7 +71,7 @@ void runPeriodically(void (*method)(), unsigned long interval, unsigned long* va
 void logDataToRAM() {
   int timeStamp = millis();
   int sensorReading = analogRead(A0);
-  String line = String(timeStamp) + "," + String(sensorReading) + "\n";
+  String line = String(timeStamp) + "," + String(random(9999)) + "\n";
   sensorDataBuffer.push_back(line);
 }
 
@@ -84,18 +88,17 @@ void moveDataToQSPI() {
 
 
 void performUpdate() {
-  Folder usbRoot = usbStorage.getRootFolder();  // Get the root folder of the USB storage
   UFile logFile = internalStorage.getRootFolder().createFile("log.txt", FileMode::READ);
-  UFile backupFile = usbRoot.createFile("backup_file.txt", FileMode::APPEND);  // Create or open the backup file
-  UFile lastUpdateFile = usbRoot.createFile("diff.txt", FileMode::READ);  // Create or open the last update file
+  UFile backupFile = backupFolder.createFile("backup_file.txt", FileMode::APPEND);  // Create or open the backup file
+  UFile lastUpdateFile = backupFolder.createFile("diff.txt", FileMode::READ);  // Create or open the last update file
 
   backingUP = true;
   unsigned lastUpdateBytes = lastUpdateFile.readAsString().toInt();  // Read the last update size from the file
 
-  Serial.print("Last update bytes: " + String(lastUpdateBytes) + "\n");
+  printToSerialOrRS485("Last update bytes: " + String(lastUpdateBytes) + "\n");
 
   if (lastUpdateBytes >= bytesWritten) {
-    Serial.print("No new data to copy. \n");
+    printToSerialOrRS485("No new data to copy. \n");
     backupFile.close();
     lastUpdateFile.close();
     backingUP = false;
@@ -104,14 +107,14 @@ void performUpdate() {
 
   logFile.seek(lastUpdateBytes);  // Move the file pointer to the last update position
   unsigned long totalBytesToMove = bytesWritten - lastUpdateBytes;
-  Serial.print("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
 
-  Serial.print("Successfully copied " + String(bytesMoved) + " new bytes.");
+  printToSerialOrRS485("Successfully copied " + String(bytesMoved) + " new bytes. \n");
 
   lastUpdateFile.changeMode(FileMode::WRITE);  // Open the last update file in write mode
   lastUpdateFile.write(String(lastUpdateBytes + bytesMoved));  // Update the last update size
@@ -131,24 +134,34 @@ void performUpdate() {
 
 // Function to backup data to USB storage
 void backupToUSB() {
-  if (usbAvailable) {
-    Serial.print("USB Mass storage is available \n");
+  if(usbAvailable && !usbIntialized){
+      usbStorage.begin();
+      printToSerialOrRS485("First drive insertion, creating folders... \n");
+      Folder usbRoot = usbStorage.getRootFolder();
+      String folderName = "LoggerBackup" + String(random(9999));
+      backupFolder = usbRoot.createSubfolder(folderName);
+      printToSerialOrRS485("Succesfully created backup folder: " + backupFolder.getPathAsString() + "\n");
+      usbStorage.unmount();
+      usbIntialized = true;
+  }
+  else if(usbAvailable && usbIntialized) {
+    printToSerialOrRS485("USB Mass storage is available \n");
     delay(100);
     if (!usbStorage.isMounted()) {
 
-      Serial.print("Mounting USB Mass Storage \n");
+      printToSerialOrRS485("Mounting USB Mass Storage \n");
       digitalWrite(USB_MOUNTED_LED, LOW);
       if(usbStorage.begin()){
         performUpdate();
       } 
 
     } else if (usbStorage.isMounted()) {
-      Serial.print("USB Mass storage is connected, performing update \n");
+      printToSerialOrRS485("USB Mass storage is connected, performing update \n");
       performUpdate();
 
     }
   } else {
-    Serial.print("USB Mass storage is not available \n");
+    printToSerialOrRS485("USB Mass storage is not available \n");
   }
 
 
@@ -157,24 +170,30 @@ void backupToUSB() {
 
 void setup() {
   //beginRS485(baudrate);
-  Serial.begin(115200);
-  while(!Serial);
+  randomSeed(analogRead(A0));
+
+  #if !defined(ARDUINO_OPTA)
+    Serial.begin(115200);
+    while(!Serial);
+  #else
+    beginRS485(115200);
+  #endif
 
   usbStorage.onConnect(connectionCallback);
   usbStorage.onDisconnect(disconnectionCallback);
 
   pinMode(USB_MOUNTED_LED, OUTPUT);
-  Serial.print("Formatting internal storage... \n");
+  printToSerialOrRS485("Formatting internal storage... \n");
   int formatted = internalStorage.format(FS_LITTLEFS);
-  Serial.print("QSPI Format status: " + String(formatted) + "\n");
- 
+  printToSerialOrRS485("QSPI Format status: " + String(formatted) + "\n");
+
 
 
   if (!internalStorage.begin()) {
-    Serial.print("Failed to initialize internal storage \n");
+    printToSerialOrRS485("Failed to initialize internal storage \n");
     return;
   } else {
-    Serial.print("Initialized storage \n");
+    printToSerialOrRS485("Initialized storage \n");
   }
 
 }

examples/OptaLogger/OptaLogger.ino

@@ -31,7 +31,7 @@ constexpr auto baudrate { 115200 };
 
 
 
-InternalStorage internalStorage = InternalStorage(true, "userData", FS_FAT);
+InternalStorage internalStorage = InternalStorage(]);
 USBStorage usbStorage = USBStorage();
 std::vector<String> sensorDataBuffer;