fixed bug on first-time internal storage usage

Author: cristidragomir97

examples/AdvancedUSBInternalOperations/AdvancedUSBInternalOperations.ino

@@ -23,7 +23,7 @@
 
 */
 
-#define UNIFIED_STORAGE_DEBUG
+#define ARDUINO_UNIFIED_STORAGE_DEBUG
 #include "Arduino_UnifiedStorage.h"
 
 // Two instances are made for the USB and internal storage respectively

examples/SimpleStorageWriteRead/SimpleStorageWriteRead.ino

@@ -27,8 +27,15 @@
 
 */
 
+
 #include "Arduino_UnifiedStorage.h"
 
+// Redirect Serial.print*() output to GDB instead of SerialUSB where it would conflict with ThreadDebug.
+// NOTE: Calls to Serial.print*() will block waiting for GDB to be connected so only useful to use this redefine
+//       when actively debugging the program.
+
+
+
 void printFolderContents(Folder dir, int indentation = 0) {
   std::vector<Folder> directories = dir.getFolders();
   std::vector<UFile> files = dir.getFiles();
@@ -57,15 +64,23 @@ void printFolderContents(Folder dir, int indentation = 0) {
 // Uncomment one of the three lines below to select between SD card, USB or internal storage
 //SDStorage unifiedStorage = SDStorage();             // Create an instance for interacting with SD card storage
 //USBStorage unifiedStorage = USBStorage()            // Create an instance for interacting with USB storage
-InternalStorage internalStorage = InternalStorage();// Create an instance for interacting with internal Flash storage (default)
+InternalStorage internalStorage = InternalStorage();
 
 void setup() {
+
+
   Serial.begin(115200);
   while (!Serial);
 
+
+
+  internalStorage = InternalStorage();
+
   if(!internalStorage.begin()){
     Serial.println("Error mounting storage device.");
   }
+
+
 
   // Create a root directory in storage device
   Folder root = internalStorage.getRootFolder();

extras/tests/TestFolderOperations/TestFolderOperations.ino

@@ -1,8 +1,6 @@
 
-
-#include <Arduino_UnifiedStorage.h>
-
 #define ARDUINO_UNIFIED_STORAGE_DEBUG
+#include <Arduino_UnifiedStorage.h>
 
 #if defined(HAS_USB)
 USBStorage usb = USBStorage();

src/InternalStorage.cpp

@@ -4,12 +4,12 @@ InternalStorage::InternalStorage(){
     std::vector<Partition> partitionsAvailable = Partitioning::readPartitions(QSPIFBlockDeviceType::get_default_instance());
     if(partitionsAvailable.size() == 0){
 
-        debugPrint("[InternalStorage][INFO] No partitions found, restoring default partitions");
+        //debugPrint("[InternalStorage][INFO] No partitions found, restoring default partitions");
         restoreDefaultPartitions();
     } else {
         int lastPartitionNumber = partitionsAvailable.size();
         FileSystems lastPartitionFileSystem = partitionsAvailable.back().fileSystemType;
-        debugPrint("[InternalStorage][INFO] Found " + String(lastPartitionNumber) + " partitions, using last partition as internal storage");
+        //debugPrint("[InternalStorage][INFO] Found " + String(lastPartitionNumber) + " partitions, using last partition as internal storage");
 
         this -> partitionNumber = lastPartitionNumber;
         this -> fileSystemType = lastPartitionFileSystem;

src/Partitioning.cpp

@@ -26,7 +26,7 @@ bool Partitioning::isPartitionSchemeValid(BlockDeviceType * blockDevice, std::ve
     for (size_t i = 1; i < partitions.size() + 1; ++i) {
         Partition thisPartition = partitions[i - 1];
 
-        if(thisPartition.size % 64 == 0){
+        if(thisPartition.size < 0 && (thisPartition.size & (thisPartition.size - 1)) != 0){
             return false;
         }
         totalSize += thisPartition.size;
@@ -96,17 +96,21 @@ bool Partitioning::partitionDrive(BlockDeviceType * blockDevice, std::vector<Par
     blockDevice -> init();
 
     if(!isPartitionSchemeValid(blockDevice, partitions)){
+        blockDevice -> deinit();
         return false;
     }
 
     if(!eraseMBRSector(blockDevice)){
+        blockDevice -> deinit();
         return false;
     }
 
     if(!createAndFormatPartitions(blockDevice, partitions)){
+        blockDevice -> deinit();
         return false;
     }
 
+    blockDevice -> deinit();
     return true;
 }