AE-593: Small fixes for example sketches.

Author: bogdanarduino

examples/AdvancedUSBInternalOperations/AdvancedUSBInternalOperations.ino

@@ -4,7 +4,7 @@
     Demonstrates advanced usage of the "Arduino_UnifiedStorage" library with USB & internal storage, including file operations.
     Creates, copies, and moves files between storage types, and prints folder contents.
 
-    In the setup function, the code initializes serial communication, mounts both USB & internal storage and 
+    In the setup function, the code initializes Serial communication, mounts both USB & internal storage and 
     reformats the internal storage for a clean file system. Then, it creates a root directory in the internal storage
     and creates a subdirectory with a file inside it containing the string "Hello World!".
 
@@ -28,7 +28,6 @@
 USBStorage usbStorage;
 InternalStorage internalStorage;
 
-
 // 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) {
   std::vector<Folder> directories = dir.getFolders();
@@ -54,18 +53,17 @@ void printFolderContents(Folder dir, int indentation = 0) {
   }
 }
 
-
-
 void setup() {
-  Serial.begin(115200);
-  while (!Serial);
+#if !defined(ARDUINO_OPTA)
+    Serial.begin(115200);
+    while(!Serial);
+#else
+    beginRS485(115200);
+#endif
 
   // toggle this to enable debugging output
   Arduino_UnifiedStorage::debuggingModeEnabled = false;
 
-  usbStorage = USBStorage();
-  internalStorage = InternalStorage();
-
   // Mount the USB storage
   if(usbStorage.begin()){
     Serial.println("USB storage mounted.");
@@ -109,8 +107,8 @@ void setup() {
   }
 
   // Print contents of the USB storage
-  //Serial.println("USB storage contents:");
-  //printFolderContents(usbStorage.getRootFolder());
+  Serial.println("USB storage contents:");
+  printFolderContents(usbStorage.getRootFolder());
 
   // Print contents of the internal storage
   Serial.println("Internal storage contents:");

examples/BackupInternalPartitions/BackupInternalPartitions.ino

@@ -4,7 +4,7 @@
     This code demonstrates how the "Arduino_UnifiedStorage" can be used to access multiple partitions on the internal storage,
     and transfer information to a USB Mass storage device.
 
-    In the setup function, the code initializes serial communication, and registers a callback for the insertion of the USB Drive. 
+    In the setup function, the code initializes Serial communication, and registers a callback for the insertion of the USB Drive. 
     
     If the device is successfully mounted, a folder for this instance of a backup will be created on the USB Drive.
 
@@ -38,7 +38,6 @@ volatile boolean connected = false;
 
 USBStorage thumbDrive;
 
-
 void addSomeFakeFiles(Folder * folder){
     Serial.println("Adding some fake files to: " + String(folder -> getPathAsString()));
 
@@ -72,20 +71,19 @@ void move(Folder * source, Folder * dest){
 }
 
 
-
-
-
 void setup(){
     randomSeed(analogRead(A0));
 
+#if !defined(ARDUINO_OPTA)
     Serial.begin(115200);
     while(!Serial);
+#else
+    beginRS485(115200);
+#endif
 
     // toggle this to enable debugging output
     Arduino_UnifiedStorage::debuggingModeEnabled = false;
 
-    thumbDrive = USBStorage();
-
     bool thumbMounted = thumbDrive.begin(FS_FAT);
     if(thumbMounted){
         Serial.println("USB Thumb Drive has been mounted");
@@ -121,14 +119,9 @@ void setup(){
 
         thumbDrive.unmount();
 
-
         Serial.println("DONE, you can restart the board now");
     }
-
-
 }
 
-
 void loop(){
-
 }

examples/Callbacks/Callbacks.ino

@@ -13,7 +13,6 @@
   - You can also customize the LED indicators for different boards according to your hardware configuration.
 */
 
-
 #include "Arduino_UnifiedStorage.h"
 
 #if defined(ARDUINO_PORTENTA_H7_M7)
@@ -27,17 +26,32 @@
 USBStorage usbStorage = USBStorage();
 
 void connectionCallback(){
+#if defined(ARDUINO_PORTENTA_H7_M7)
+    digitalWrite(CALLBACK_LED, LOW);
+#elif defined(ARDUINO_PORTENTA_C33)
+    digitalWrite(CALLBACK_LED, LOW);
+#elif defined(ARDUINO_OPTA)
     digitalWrite(CALLBACK_LED, HIGH);
+#endif
 }
 
 void disconnectionCallback(){
+#if defined(ARDUINO_PORTENTA_H7_M7)
+    digitalWrite(CALLBACK_LED, HIGH);
+#elif defined(ARDUINO_PORTENTA_C33)
+    digitalWrite(CALLBACK_LED, HIGH);
+#elif defined(ARDUINO_OPTA)
     digitalWrite(CALLBACK_LED, LOW);
+#endif
 }
 
 void setup(){
     pinMode(CALLBACK_LED, OUTPUT);
     usbStorage.onConnect(connectionCallback);
     usbStorage.onDisconnect(disconnectionCallback);
+#if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_C33)
+    digitalWrite(CALLBACK_LED, HIGH);
+#endif
 }
 
 void loop(){

examples/InternalStoragePartitioning/InternalStoragePartitioning.ino

@@ -23,7 +23,7 @@
 
     INSTRUCTIONS:
     1. Check compatibility with your board and make sure you have "POSIXStorage" and "Arduino_UnifiedStorage" installed
-    2. Connect your board to the serial monitor
+    2. Connect your board to the Serial monitor
     3. Wait for the sketch to run
     4. Modify the partitioning scheme according to your needs
 

examples/Logger/Logger.ino

@@ -25,7 +25,6 @@
 #include "Arduino_UnifiedStorage.h"
 #include <vector>
 
-
 #if defined(ARDUINO_PORTENTA_H7_M7)
 #define USB_MOUNTED_LED LED_BLUE
 #elif defined(ARDUINO_PORTENTA_C33)
@@ -53,12 +52,13 @@ bool backingUP = false;
 void connectionCallback(){
     usbAvailable = true;
     usbStorage.removeOnConnectCallback();
+    Serial.println("USB drive connected.");
 }
 
 void disconnectionCallback(){
     usbAvailable = false;
     usbStorage.onConnect(connectionCallback);
-
+    Serial.println("USB drive disconnected.");
 }
 // Function to run a given method periodically
 void runPeriodically(void (*method)(), unsigned long interval, unsigned long* variable) {
@@ -89,7 +89,6 @@ void moveDataToQSPI() {
   }
 }
 
-
 void performUpdate() {
   UFile logFile = internalStorage.getRootFolder().createFile("log.txt", FileMode::READ);
   UFile backupFile = backupFolder.createFile("backup_file.txt", FileMode::APPEND);  // Create or open the backup file
@@ -126,7 +125,6 @@ void performUpdate() {
   logFile.close();
   lastUpdateFile.close();
 
-
   usbStorage.unmount();  // Unmount the USB storage
 
   digitalWrite(USB_MOUNTED_LED, HIGH);
@@ -166,27 +164,22 @@ void backupToUSB() {
   } else {
     Arduino_UnifiedStorage::debugPrint("USB Mass storage is not available ");
   }
-
-
 }
 
 
 void setup() {
   randomSeed(analogRead(A0));
 
-  #if !defined(ARDUINO_OPTA)
-    Serial.begin(115200);
-    while(!Serial);
-  #else
-    beginRS485(115200);
-  #endif
+#if !defined(ARDUINO_OPTA)
+  Serial.begin(115200);
+  while(!Serial);
+#else
+  beginRS485(115200);
+#endif
 
   // toggle this to enable debugging output
   Arduino_UnifiedStorage::debuggingModeEnabled = false;
 
-  usbStorage = USBStorage();
-  internalStorage = InternalStorage();
-
   usbStorage.onConnect(connectionCallback);
   usbStorage.onDisconnect(disconnectionCallback);
 
@@ -195,20 +188,15 @@ void setup() {
   int formatted = internalStorage.format(FS_LITTLEFS);
   Arduino_UnifiedStorage::debugPrint("QSPI Format status: " + String(formatted));
 
-
-
   if (!internalStorage.begin()) {
     Arduino_UnifiedStorage::debugPrint("Failed to initialize internal storage ");
     return;
   } else {
     Arduino_UnifiedStorage::debugPrint("Initialized storage ");
   }
-
 }
 
 void loop() {
-
-  
   runPeriodically(logDataToRAM, 100, &lastLog);
   runPeriodically(moveDataToQSPI, 1000, &lastMove);
   runPeriodically(backupToUSB, 10000, &lastBackup);

examples/SimpleStorageWriteRead/SimpleStorageWriteRead.ino

@@ -29,6 +29,20 @@
 
 #include "Arduino_UnifiedStorage.h"
 
+// Set one of the following to "true" and the rest to "false" in order to select one storage medium
+#define USE_SD_STORAGE              false
+#define USE_USB_STORAGE             false
+#define USE_INTERNAL_STORAGE        true
+
+#if defined(USE_SD_STORAGE) && (USE_SD_STORAGE == true)
+SDStorage storage;             // Create an instance for interacting with SD card storage
+#elif defined(USE_USB_STORAGE) && (USE_USB_STORAGE == true)
+USBStorage storage;            // Create an instance for interacting with USB storage
+#elif defined(USE_INTERNAL_STORAGE) && (USE_INTERNAL_STORAGE == true)
+InternalStorage storage;
+#else
+#error "No valid storage option defined! Please define one of USE_SD_STORAGE, USE_USB_STORAGE, or USE_INTERNAL_STORAGE as true."
+#endif
 
 void printFolderContents(Folder dir, int indentation = 0) {
   std::vector<Folder> directories = dir.getFolders();
@@ -54,25 +68,19 @@ void printFolderContents(Folder dir, int indentation = 0) {
   }
 }
 
-
-// Uncomment one of the three lines below to select between SD card, USB or internal storage
-//SDStorage storage;             // Create an instance for interacting with SD card storage
-//USBStorage storage;            // Create an instance for interacting with USB storage
-InternalStorage storage;
-
-
 void setup() {
-  Serial.begin(115200);
-  while (!Serial);
+
+// if we are on the Arduino Opta, and have decided to log on an USB drive connected to the USB-C connecter, we have to output the serial data through the RJ45 channel.
+#if (defined(ARDUINO_OPTA)) && (defined(USE_USB_STORAGE) &&  (USE_USB_STORAGE == true))
+    beginRS485(115200);
+#else
+    Serial.begin(115200);
+    while (!Serial);
+#endif
 
   // toggle this to enable debugging output
   Arduino_UnifiedStorage::debuggingModeEnabled = false;
 
-
-  storage = InternalStorage();
-  // storage = SDStorage(); // Uncomment this line to use SD card storage
-  // storage = USBStorage(); // Uncomment this line to use USB storage
-
   if(!storage.begin()){
     Serial.println("Error mounting storage device.");
   }