Merge pull request #11 from arduino-libraries/refactorings

Apply Refactorings

Author: cristidragomir97

src/USBStorage.cpp

@@ -6,25 +6,22 @@
 
 #define MAX_TRIES 10
 
-USBStorage::USBStorage(){
- #if defined(ARDUINO_PORTENTA_C33)
-         register_hotplug_callback(DEV_USB,  [](){
-            usb_available = !usb_available;
+bool USBStorage::usb_available = false;
 
-        });
+USBStorage::USBStorage(){
+#if defined(ARDUINO_PORTENTA_C33)
+    register_hotplug_callback(DEV_USB,  [](){
+        usb_available = !usb_available;
+    });
 #endif
 }
 
-
 int USBStorage::begin(FileSystems fs){
   this -> fs = fs;
   this -> begin();
 }
 
 int USBStorage::begin(){
-
- 
-
     int attempts = 0;
     int err = mount(DEV_USB, this->fs, MNT_DEFAULT);
 
@@ -43,14 +40,12 @@ int USBStorage::begin(){
     return err == 0;
 }
 
-
 int USBStorage::unmount(){
   auto unmountResult = umount(DEV_USB);
 
 
   if(unmountResult == 0){
       this -> connected = false;
-  } else {
   }
 
   return unmountResult == 0;
@@ -60,7 +55,6 @@ Folder USBStorage::getRootFolder(){
     return Folder("/usb");
 }
 
-
 bool USBStorage::isAvailable(){
     return usb_available;
 }
@@ -69,62 +63,27 @@ bool USBStorage::isConnected(){
     return this -> connected;
 }
 
-
-/*
-
-
 void USBStorage::checkConnection(){
-    #if defined(ARDUINO_PORTENTA_H7_M7)
-    USBHost * host;
-    USBDeviceConnected * dev;
-    unsigned long currentMillis = millis();
-    boolean found = false;
-
-    if (currentMillis - previousMillis >= interval) {
-        this -> previousMillis = currentMillis;
-            host = USBHost::getHostInst();
-            if(host->getDevice(0) != NULL){
-                this->available = true;
-            } else {
-                this->available = false;
-            }
-    }
-    #endif
-}
-*/
-
-
-void USBStorage::checkConnection(){
-    #if defined(ARDUINO_PORTENTA_H7_M7)
     USBHost * host;
     USBDeviceConnected * dev;
+#if defined(ARDUINO_PORTENTA_H7_M7)
     unsigned long currentMillis = millis();
     boolean found = false;
 
     if (currentMillis - previousMillis >= interval) {
-        this -> previousMillis = currentMillis;
-
-            host = USBHost::getHostInst();
-
-        
-                    if ((dev = host->getDevice(0)) != NULL) {
-                         usb_available = true;
-
-                        uint8_t ceva =  dev->getNbIntf();
-                           found = true;
-                        } else {
-                             usb_available = false;
-                        }
+      this->previousMillis = currentMillis;
+      host = USBHost::getHostInst();
+
+      if ((dev = host->getDevice(0)) != NULL){
+          usb_available = true;
+          found = true;
+      } else{
+          usb_available = false;
+      }
     }
-        
-                
-         
-
-    #endif
+#endif
 }
 
-
-
 int USBStorage::formatFAT(){
     this -> begin();
     this -> unmount();

src/USBStorage.h

@@ -3,9 +3,6 @@
 #ifndef USBStorage_H
 #define USBStorage_H
 
-
-static bool usb_available = false;
-
 /**
  * Represents a USB storage using the Arduino Unified Storage library.
  */
@@ -83,7 +80,8 @@ class USBStorage : public Arduino_UnifiedStorage {
     FileSystems fs = FS_FAT;
     bool connected = false;
     unsigned long previousMillis; 
-    int interval = 500;
+    unsigned int interval = 500;
+    static bool usb_available;
 };
 
 #endif