all examples compile, update for logger on opta and c33

Author: cristidragomir97

examples/logger/logger.ino

@@ -173,7 +173,9 @@ void setup() {
 }
 
 void loop() {
-  usbStorage.checkConnection();
+  #if defined(ARDUINO_PORTENTA_H7_M7)
+    usbStorage.checkConnection();
+  #endif
   runPeriodically(logDataToRAM, 100, &lastLog);
   runPeriodically(moveDataToQSPI, 1000, &lastMove);
   runPeriodically(backupToUSB, 10000, &lastBackup);

examples/opta_logger/opta_logger.ino

@@ -12,7 +12,7 @@ The "performUpdate" function performs the update process by:
 INSTRUCTIONS
 * Make sure the QSPI storage of your board is properly partitioned. 
     * You can do that by flashing the QSPIFormat example that can be found in the STM32H747_System folder
-    * Open the serial monitor and select answer with "Y" when this appears "Do you want to use partition scheme 1? Y/[n]"
+    * Open the //Serial monitor and select answer with "Y" when this appears "Do you want to use partition scheme 1? Y/[n]"
     * Reboot the board
 * Connect a RS485-enabled device to see the debugging output. 
 * This sketch will log data, and check if there is any USB MSD Device connected to the USB Port of the Opta. 
@@ -24,14 +24,8 @@ INSTRUCTIONS
 #include "Arduino_UnifiedStorage.h"
 #include <vector>
 
-#if defined(ARDUINO_PORTENTA_H7_M7)
-#define USB_MOUNTED_LED LED_BLUE
-#elif defined(ARDUINO_PORTENTA_C33)
-#define USB_MOUNTED LED LEDB
-#endif 
-constexpr auto baudrate { 115200 };
-
 
+constexpr auto baudrate { 115200 };
 
 
 InternalStorage internalStorage = InternalStorage();
@@ -86,10 +80,10 @@ void performUpdate() {
   backingUP = true;
   int lastUpdateBytes = lastUpdateFile.readAsString().toInt();  // Read the last update size from the file
 
-  Serial.print("Last update bytes: "); Serial.println(lastUpdateBytes);
+  //Serial.print("Last update bytes: "); //Serial.println(lastUpdateBytes);
 
   if (lastUpdateBytes >= bytesWritten) {
-    Serial.println("No new data to copy.");
+    //Serial.println("No new data to copy.");
     backupFile.close();
     lastUpdateFile.close();
     backingUP = false;
@@ -98,13 +92,13 @@ void performUpdate() {
 
   logFile.seek(lastUpdateBytes);  // Move the file pointer to the last update position
   unsigned long totalBytesToMove = bytesWritten - lastUpdateBytes;
-  Serial.print("New update bytes: "); Serial.println(totalBytesToMove);
+  //Serial.print("New update bytes: "); //Serial.println(totalBytesToMove);
 
   uint8_t buffer[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.println("Successfully copied " + String(bytesMoved) + " new bytes.");
+  //Serial.println("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
@@ -113,10 +107,10 @@ void performUpdate() {
   logFile.close();
   lastUpdateFile.close();
 
-  Serial.println();
+  //Serial.println();
   usbStorage.unmount();  // Unmount the USB storage
 
-  digitalWrite(USB_MOUNTED_LED, HIGH);
+  digitalWrite(LED_D0, HIGH);
   backingUP = false;
 }
 
@@ -127,47 +121,46 @@ void disconnect(){
 // Function to backup data to USB storage
 void backupToUSB() {
   if (usbStorage.isAvailable()) {
-    Serial.println("USB Mass storage is available");
+    //Serial.println("USB Mass storage is available");
     delay(100);
     if (!usbStorage.isConnected()) {
 
-      Serial.println("Mounting USB Mass Storage");
-      digitalWrite(USB_MOUNTED_LED, LOW);
+      //Serial.println("Mounting USB Mass Storage");
+      digitalWrite(LED_D0, LOW);
       if(usbStorage.begin()){
         performUpdate();
       } 
 
 
 
     } else if (usbStorage.isConnected()) {
-      Serial.println("USB Mass storage is connected, performing update");
+      //Serial.println("USB Mass storage is connected, performing update");
       performUpdate();
 
     }
   } else {
-    Serial.println("USB Mass storage is not available");
+    //Serial.println("USB Mass storage is not available");
   }
 
 
 }
 
 
 void setup() {
-  Serial.begin(115200);
-  while (!Serial);
-  pinMode(USB_MOUNTED_LED, OUTPUT);
-  Serial.println("Formatting internal storage...");
+  //Serial.begin(115200);
+  pinMode(LED_D0, OUTPUT);
+  //Serial.println("Formatting internal storage...");
   int formatted = internalStorage.format();
-  Serial.print("QSPI Format status: "); Serial.println(formatted);
+  //Serial.print("QSPI Format status: "); //Serial.println(formatted);
 
   //configureRS485(baudrate);
-  //Serial.println("RS485 goes brrr...");
+  ////Serial.println("RS485 goes brrr...");
 
   if (!internalStorage.begin() == 0) {
-    Serial.println("Failed to initialize internal storage");
+    //Serial.println("Failed to initialize internal storage");
     return;
   } else {
-    Serial.println("Initialized storage");
+    //Serial.println("Initialized storage");
   }
 
 }

src/Arduino_UnifiedStorage.h

@@ -16,7 +16,6 @@
 
 
 
-
     #if defined(ARDUINO_PORTENTA_C33)
         #include "QSPIFlashBlockDevice.h"
         #include <BlockDevice.h>

src/InternalStorage.cpp

@@ -3,7 +3,7 @@
 InternalStorage::InternalStorage(){
     #if defined(ARDUINO_PORTENTA_C33)
         this -> blockDevice = BlockDevice::get_default_instance();
-        this -> userData = new MBRBlockDevice(this->blockDevice, 2);
+        this -> userData = new MBRBlockDevice(this->blockDevice, this->partitionNumber);
         this -> userDataFileSystem = new FATFileSystem(this->partitionName);
     #elif defined(ARDUINO_PORTENTA_H7_M7) ||  defined(ARDUINO_OPTA) 
         this -> blockDevice = QSPIFBlockDevice::get_default_instance();

src/Types.h

@@ -75,6 +75,7 @@ static bool copyFolder(const char* source, const char* destination) {
     closedir(dir);
     return true;
 }
+
 static std::string replaceLastPathComponent(const std::string& path, const std::string& newComponent) {
     size_t lastSlashIndex = path.find_last_of('/');
     if (lastSlashIndex != std::string::npos) {

src/UFile.cpp

@@ -54,7 +54,7 @@ bool UFile::open(String filename, FileMode mode) {
 void UFile::close() {
     // Close the file
     if (fp != nullptr) {
-        fflush(fp);
+        fflush(fp); // ?!?
         fclose(fp);
         fp = nullptr;
     }
@@ -162,17 +162,17 @@ size_t UFile::write(const uint8_t* buffer, size_t size) {
 
 bool UFile::remove() {
     // Remove the file;
-    if (!path.empty()) {
-        int result = ::remove(path.c_str());
-        if (result == 0) {
-            return true;
+    if(this->exists() && !path.empty()){
+            int result = ::remove(path.c_str());
+            if (result == 0) {
+                return true;
+            } else {
+                // Error occurred while removing the file
+                return false;
+            }
         } else {
-            // Error occurred while removing the file
-            return false;
+            return false; // Handle the case when the path is not valid
         }
-    } else {
-        return false; // Handle the case when the path is not valid
-    }
 }
 
 bool UFile::rename(const char* newFilename) {

src/USBStorage.cpp

@@ -7,24 +7,18 @@
 #define MAX_TRIES 10
 
 USBStorage::USBStorage(){
+ #if defined(ARDUINO_PORTENTA_C33)
+         register_hotplug_callback(DEV_USB,  [](){
+            Serial.println("caalllback");
+            available = !available;
 
-}
-
-void USBStorage::usbCallback(){
-    /*
-    if(this-> available){
-        this -> available = false;
-    } else {
-        this -> available = true; 
-    }
-    */
+        });
+#endif
 }
 
 int USBStorage::begin(){
 
-    #if defined(ARDUINO_PORTENTA_C33)
-        register_hotplug_callback(DEV_USB, this->usbCallback);
-    #endif
+ 
 
     int attempts = 0;
     int err = mount(DEV_USB, FS_FAT, MNT_DEFAULT);
@@ -64,22 +58,13 @@ Folder USBStorage::getRootFolder(){
 
 
 bool USBStorage::isAvailable(){
-    return this -> available;
+    return available;
 }
 
 bool USBStorage::isConnected(){
     return this -> connected;
 }
 
-void USBStorage::disconnect(){
-
-
-    USBHost * host;
-    USBDeviceConnected * dev;
-     host = USBHost::getHostInst();
-     host -> getDevice(0) -> disconnect();
-
-}
 
 /*
 
@@ -119,20 +104,12 @@ void USBStorage::checkConnection(){
 
 
                     if ((dev = host->getDevice(0)) != NULL) {
-                         this->available = true;
+                         available = true;
 
                         uint8_t ceva =  dev->getNbIntf();
-                        /*
-                
-                        Serial.println(dev->getName(ceva));
-                        Serial.println(dev->getVid());
-                        Serial.println(dev->getPid());
-                        Serial.println(dev->getClass());
-                        Serial.println(dev->getSubClass());
-                 */
                            found = true;
                         } else {
-                             this->available = false;
+                             available = false;
                         }
     }
 

src/USBStorage.h

@@ -3,6 +3,12 @@
 #ifndef USBStorage_H
 #define USBStorage_H
 
+static bool available = false;
+
+
+static bool available = false;
+
+
 class USBStorage : public Arduino_UnifiedStorage {
     public:
         USBStorage();
@@ -21,15 +27,12 @@ class USBStorage : public Arduino_UnifiedStorage {
 
         void checkConnection();
 
-        void disconnect();
 
 
     private:
-        void usbCallback();
+  
         bool connected = false;
-        bool available = false;
-        bool hasChanged = false;
-        bool isIdentical = false;
+   
         unsigned long previousMillis; 
         int interval = 500;
 };

tests/test_qspi_usb_sd/test_c33

@@ -1,3 +1,7 @@
 #!/bin/bash
+<<<<<<< Updated upstream
 arduino-cli compile -b arduino:renesas_portenta:portenta_c33  --library "../../Arduino_POSIXStorage" --library  "/home/c.dragomir/ArduinoWorkspace/Arduino_UnifiedStorage"
+=======
+arduino-cli compile -b arduino:renesas_portenta:portenta_c33  --library "/home/c.dragomir/ArduinoWorkspace/Repos/POSIXStorage" --library  "/home/c.dragomir/ArduinoWorkspace/Repos/Arduino_UnifiedStorage"
+>>>>>>> Stashed changes
 arduino-cli upload -b arduino:renesas_portenta:portenta_c33 

tests/test_qspi_usb_sd/test_h7

@@ -1,3 +1,8 @@
 #!/bin/bash
+<<<<<<< Updated upstream
 arduino-cli compile -b arduino:mbed_portenta:envie_m7 --library "../../Arduino_POSIXStorage" --library  "/home/c.dragomir/ArduinoWorkspace/Arduino_UnifiedStorage"
-arduino-cli upload -b arduino:mbed_portenta:envie_m7
+arduino-cli upload -b arduino:mbed_portenta:envie_m7
+=======
+arduino-cli compile -b arduino:mbed_portenta:envie_m7  --library "../../../POSIXStorage"  --library "../../../Arduino_UnifiedStorage"
+
+>>>>>>> Stashed changes

tests/test_qspi_usb_sd/test_qspi_usb_sd.ino

@@ -138,6 +138,8 @@ void runRepeatedMountTest(UnifiedStorage * storage, String storageType, int n =
       Serial.println("Unmounting drive");
       Serial.println(umountResult);
       Serial.println(getErrno());
+    } else {
+      Serial.println("Succesfully unmounted");
     }
   }
 }
@@ -151,23 +153,15 @@ void setup() {
     runRepeatedMountTest(&sd, "SD");
     runRepeatedMountTest(&internal, "QSPI");
 
-
-
-    #ifdef HAS_QSPI 
+    runTests(&usb, "USB Storage");
     runTests(&internal, "Internal Storage (QSPI)");
-    #endif
-
-    #ifdef HAS_SD
     runTests(&sd, "SD Storage");
-    #endif
 
-    #ifdef HAS_USB
-    runTests(&usb, "USB Storage");
-    #endif
 
 
-    bool thing = interStorageTests(&sd, &internal, "SD", "Internal"); // Test copying/moving from SD to Internal Storage
-    Serial.println(thing);
+    
+    interStorageTests(&sd, &internal, "SD", "Internal"); // Test copying/moving from SD to Internal Storage
+    delay(1000);
 
     interStorageTests(&usb, &sd, "USB", "SD"); // Test copying/moving from USB to SD
     delay(1000);
@@ -201,7 +195,7 @@ void runTests(UnifiedStorage * storage, String storageType) {
   if (storage->begin()) {
 
     Folder root = storage->getRootFolder();
-    clearData(root);
+  
     Serial.println("=== Testing " + storageType + " ===");
 
     Serial.println("========= UFile Tests =========");
@@ -231,7 +225,7 @@ void runTests(UnifiedStorage * storage, String storageType) {
     Serial.println("========= FS Contents after Folder Tests =========");
     printFolderContents(root);
     Serial.println("=============================\n");
-   // storage->unmount();
+    storage->unmount();
 
   } else {
     Serial.println(storageType + " not initialized!");