AE-593: Changed call to "Arduino_UnifiedStorage::debugPrint" into "Arduino_UnifiedStorage::testPrint" which allows correct print outputs on all boards (including the Opta) without the clutter of the extra debug information.

Author: bogdanarduino

examples/BackupInternalPartitions/BackupInternalPartitions.ino

@@ -39,11 +39,11 @@ volatile boolean connected = false;
 USBStorage thumbDrive;
 
 void addSomeFakeFiles(Folder * folder){
-    Arduino_UnifiedStorage::debugPrint("Adding some fake files to: " + String(folder -> getPathAsString()));
+    Arduino_UnifiedStorage::testPrint("Adding some fake files to: " + String(folder -> getPathAsString()));
 
     for (int i = 0; i < random(0, 9); i++){
         UFile thisFile = folder -> createFile("File_"+ String(random(999)), FileMode::WRITE);
-        Arduino_UnifiedStorage::debugPrint("\t * " + thisFile.getPathAsString());
+        Arduino_UnifiedStorage::testPrint("\t * " + thisFile.getPathAsString());
         thisFile.write("writing stuff to the file");
         thisFile.close();
     }
@@ -52,20 +52,20 @@ void addSomeFakeFiles(Folder * folder){
     Folder subfolder = folder -> createSubfolder("ChildFolder_"+ String(random(999)));
     for (int i = 0; i < random(0, 9); i++){
         UFile thisFile = subfolder.createFile("File_"+ String(random(999)), FileMode::WRITE);
-        Arduino_UnifiedStorage::debugPrint("\t * " + thisFile.getPathAsString());
+        Arduino_UnifiedStorage::testPrint("\t * " + thisFile.getPathAsString());
         thisFile.write("writing stuff to the file");
         thisFile.close();
     }
 }
 
 void move(Folder * source, Folder * dest){
     for(Folder f: source -> getFolders()){
-        Arduino_UnifiedStorage::debugPrint("Copying folder :" + String(f.getPathAsString()));
+        Arduino_UnifiedStorage::testPrint("Copying folder :" + String(f.getPathAsString()));
         f.moveTo(*dest);
     }
 
     for(UFile f: source -> getFiles()){
-        Arduino_UnifiedStorage::debugPrint("Copying file :" + String(f.getPathAsString()));
+        Arduino_UnifiedStorage::testPrint("Copying file :" + String(f.getPathAsString()));
         f.moveTo(*dest);
     }
 }
@@ -82,21 +82,21 @@ void setup(){
 #endif
 
     // toggle this to enable debugging output
-    Arduino_UnifiedStorage::debuggingModeEnabled = true;
+    Arduino_UnifiedStorage::debuggingModeEnabled = false;
 
     bool thumbMounted = thumbDrive.begin(FS_FAT);
     if(thumbMounted){
-        Arduino_UnifiedStorage::debugPrint("USB Thumb Drive has been mounted");
+        Arduino_UnifiedStorage::testPrint("USB Thumb Drive has been mounted");
 
         Folder thumbRoot = thumbDrive.getRootFolder();
         String folderName = "InternalBackup_" + String(millis());
-        Arduino_UnifiedStorage::debugPrint(folderName);
+        Arduino_UnifiedStorage::testPrint(folderName);
         Folder backupFolder = thumbRoot.createSubfolder(folderName);
 
         int partitionIndex = 0;
 
         std::vector<Partition> partitions = InternalStorage::readPartitions();
-        Arduino_UnifiedStorage::debugPrint("Found " + String(partitions.size()) + " partitions on internalStorage \n");
+        Arduino_UnifiedStorage::testPrint("Found " + String(partitions.size()) + " partitions on internalStorage \n");
 
         for (auto part: partitions){
             partitionIndex++;
@@ -107,7 +107,7 @@ void setup(){
             thisPartition.begin();
 
             Folder partitionRootFolder = thisPartition.getRootFolder();
-            Arduino_UnifiedStorage::debugPrint(partitionRootFolder.getPathAsString());
+            Arduino_UnifiedStorage::testPrint(partitionRootFolder.getPathAsString());
 
             if(createFakeFiles){
                 addSomeFakeFiles(&partitionRootFolder);
@@ -119,7 +119,7 @@ void setup(){
 
         thumbDrive.unmount();
 
-        Arduino_UnifiedStorage::debugPrint("DONE, you can restart the board now");
+        Arduino_UnifiedStorage::testPrint("DONE, you can restart the board now");
     }
 }
 

examples/Logger/Logger.ino

@@ -52,13 +52,13 @@ bool backingUP = false;
 void connectionCallback(){
     usbAvailable = true;
     usbStorage.removeOnConnectCallback();
-    Arduino_UnifiedStorage::debugPrint("USB drive connected.");
+    Arduino_UnifiedStorage::testPrint("USB drive connected.");
 }
 
 void disconnectionCallback(){
     usbAvailable = false;
     usbStorage.onConnect(connectionCallback);
-    Arduino_UnifiedStorage::debugPrint("USB drive disconnected.");
+    Arduino_UnifiedStorage::testPrint("USB drive disconnected.");
 }
 // Function to run a given method periodically
 void runPeriodically(void (*method)(), unsigned long interval, unsigned long* variable) {
@@ -97,10 +97,10 @@ void performUpdate() {
   backingUP = true;
   unsigned lastUpdateBytes = lastUpdateFile.readAsString().toInt();  // Read the last update size from the file
 
-  Arduino_UnifiedStorage::debugPrint("Last update bytes: " + String(lastUpdateBytes));
+  Arduino_UnifiedStorage::testPrint("Last update bytes: " + String(lastUpdateBytes));
 
   if (lastUpdateBytes >= bytesWritten) {
-    Arduino_UnifiedStorage::debugPrint("No new data to copy. ");
+    Arduino_UnifiedStorage::testPrint("No new data to copy. ");
     backupFile.close();
     lastUpdateFile.close();
     backingUP = false;
@@ -109,14 +109,14 @@ void performUpdate() {
 
   logFile.seek(lastUpdateBytes);  // Move the file pointer to the last update position
   unsigned long totalBytesToMove = bytesWritten - lastUpdateBytes;
-  Arduino_UnifiedStorage::debugPrint("New update bytes: " + String(totalBytesToMove));
+  Arduino_UnifiedStorage::testPrint("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
 
-  Arduino_UnifiedStorage::debugPrint("Successfully copied " + String(bytesMoved) + " new bytes. ");
+  Arduino_UnifiedStorage::testPrint("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
@@ -137,32 +137,32 @@ void performUpdate() {
 void backupToUSB() {
   if(usbAvailable && !usbIntialized){
       usbStorage.begin();
-      Arduino_UnifiedStorage::debugPrint("First drive insertion, creating folders... ");
+      Arduino_UnifiedStorage::testPrint("First drive insertion, creating folders... ");
       Folder usbRoot = usbStorage.getRootFolder();
       String folderName = "LoggerBackup" + String(random(9999));
       backupFolder = usbRoot.createSubfolder(folderName);
-      Arduino_UnifiedStorage::debugPrint("Successfully created backup folder: " + backupFolder.getPathAsString());
+      Arduino_UnifiedStorage::testPrint("Successfully created backup folder: " + backupFolder.getPathAsString());
       usbStorage.unmount();
       usbIntialized = true;
   }
   else if(usbAvailable && usbIntialized) {
-    Arduino_UnifiedStorage::debugPrint("USB Mass storage is available ");
+    Arduino_UnifiedStorage::testPrint("USB Mass storage is available ");
     delay(100);
     if (!usbStorage.isMounted()) {
 
-      Arduino_UnifiedStorage::debugPrint("Mounting USB Mass Storage ");
+      Arduino_UnifiedStorage::testPrint("Mounting USB Mass Storage ");
       digitalWrite(USB_MOUNTED_LED, LOW);
       if(usbStorage.begin()){
         performUpdate();
       } 
 
     } else if (usbStorage.isMounted()) {
-      Arduino_UnifiedStorage::debugPrint("USB Mass storage is connected, performing update ");
+      Arduino_UnifiedStorage::testPrint("USB Mass storage is connected, performing update ");
       performUpdate();
 
     }
   } else {
-    Arduino_UnifiedStorage::debugPrint("USB Mass storage is not available ");
+    Arduino_UnifiedStorage::testPrint("USB Mass storage is not available ");
   }
 }
 
@@ -178,21 +178,21 @@ void setup() {
 #endif
 
   // toggle this to enable debugging output
-  Arduino_UnifiedStorage::debuggingModeEnabled = true;
+  Arduino_UnifiedStorage::debuggingModeEnabled = false;
 
   usbStorage.onConnect(connectionCallback);
   usbStorage.onDisconnect(disconnectionCallback);
 
   pinMode(USB_MOUNTED_LED, OUTPUT);
-  Arduino_UnifiedStorage::debugPrint("Formatting internal storage... ");
+  Arduino_UnifiedStorage::testPrint("Formatting internal storage... ");
   int formatted = internalStorage.format(FS_LITTLEFS);
-  Arduino_UnifiedStorage::debugPrint("QSPI Format status: " + String(formatted));
+  Arduino_UnifiedStorage::testPrint("QSPI Format status: " + String(formatted));
 
   if (!internalStorage.begin()) {
-    Arduino_UnifiedStorage::debugPrint("Failed to initialize internal storage ");
+    Arduino_UnifiedStorage::testPrint("Failed to initialize internal storage ");
     return;
   } else {
-    Arduino_UnifiedStorage::debugPrint("Initialized storage ");
+    Arduino_UnifiedStorage::testPrint("Initialized storage ");
   }
 }
 

examples/SimpleStorageWriteRead/SimpleStorageWriteRead.ino

@@ -51,25 +51,28 @@ void printFolderContents(Folder dir, int indentation = 0) {
   // Print directories
   for (Folder subdir : directories) {
     for (int i = 0; i < indentation; i++) {
-      Arduino_UnifiedStorage::debugPrint("  ");
+      Arduino_UnifiedStorage::testPrint("  ");
     }
-    Arduino_UnifiedStorage::debugPrint("[D] ");
-    Arduino_UnifiedStorage::debugPrint(subdir.getPath());
+    Arduino_UnifiedStorage::testPrint("[D] ");
+    Arduino_UnifiedStorage::testPrint(subdir.getPath());
     printFolderContents(subdir, indentation + 1);
   }
 
   // Print files
   for (UFile file : files) {
     for (int i = 0; i < indentation; i++) {
-      Arduino_UnifiedStorage::debugPrint("  ");
+      Arduino_UnifiedStorage::testPrint("  ");
     }
-    Arduino_UnifiedStorage::debugPrint("[F] ");
-    Arduino_UnifiedStorage::debugPrint(file.getPath());
+    Arduino_UnifiedStorage::testPrint("[F] ");
+    Arduino_UnifiedStorage::testPrint(file.getPath());
   }
 }
 
 void setup() {
 
+  uint8_t index = 0u;
+  char data[20];
+
 // 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);
@@ -79,10 +82,10 @@ void setup() {
 #endif
 
   // toggle this to enable debugging output
-  Arduino_UnifiedStorage::debuggingModeEnabled = true;
+  Arduino_UnifiedStorage::debuggingModeEnabled = false;
 
   if(!storage.begin()){
-    Arduino_UnifiedStorage::debugPrint("Error mounting storage device.");
+    Arduino_UnifiedStorage::testPrint("Error mounting storage device.");
   }
 
   // Create a root directory in storage device
@@ -104,7 +107,8 @@ void setup() {
   file3.write("This is file 3.");
 
   // Read data from the files using seek and available
-  Arduino_UnifiedStorage::debugPrint("Reading data from files using seek and available:");
+  Arduino_UnifiedStorage::testPrint("Reading data from files using seek and available:");
+  Arduino_UnifiedStorage::testPrint("\n\r");
 
   // Close and open files in reading mode
   file1.changeMode(FileMode::READ);
@@ -114,27 +118,33 @@ void setup() {
 
   // Read data from file1
   file1.seek(0); // Move the file pointer to the beginning
+  //memset(data, 0u, sizeof(data));
+  std::fill(std::begin(data), std::end(data), 0u);
   while (file1.available()) {
-  char data = file1.read();
-    Arduino_UnifiedStorage::debugPrint(String(data));
+  data[index++] = file1.read();
   }
-  Arduino_UnifiedStorage::debugPrint("\n");
+  Arduino_UnifiedStorage::testPrint(data);
 
   // Read data from file2
   file2.seek(0); // Move the file pointer to the beginning
+  index = 0u;
+  //memset(data, 0u, sizeof(data));
+  std::fill(std::begin(data), std::end(data), 0u);
   while (file2.available()) {
-    char data = file2.read();
-    Arduino_UnifiedStorage::debugPrint(String(data));
+    data[index++] = file2.read();
   }
-  Arduino_UnifiedStorage::debugPrint("\n");
+  Arduino_UnifiedStorage::testPrint(data);
 
   // Read data from file3
   file3.seek(0); // Move the file pointer to the beginning
+  index = 0u;
+  //memset(data, 0u, sizeof(data));
+  std::fill(std::begin(data), std::end(data), 0u);
   while (file3.available()) {
-    char data = file3.read();
-    Arduino_UnifiedStorage::debugPrint(String(data));
+    data[index++] = file3.read();
   }
-  Arduino_UnifiedStorage::debugPrint("\n");
+  Arduino_UnifiedStorage::testPrint(data);
+  Arduino_UnifiedStorage::testPrint("\n\r");
 
   printFolderContents(storage.getRootFolder());
 }