Test for non-empty SSID before connecting

In the WiFi code, test that SSID is a non-empty string before trying to connect. Disconnect any existing wifi connection and pause long enough for it to take before going ahead.

Indentations unchanged in this commit just so it is obvious that the connection code is unchanged.

Author: sellensr

src/wifi/AdafruitIO_AIRLIFT.h

@@ -158,6 +158,10 @@ class AdafruitIO_AIRLIFT : public AdafruitIO {
     /**************************************************************************/
     void _connect()
     {
+      if(strlen(_ssid) != 0)
+      {
+        WiFi.disconnect();
+        delay(300);
       // setup ESP32 pins
       if (_ssPin != -1) {
           WiFi.setPins(_ssPin, _ackPin, _rstPin, _gpio0Pin, _wifi);
@@ -175,6 +179,7 @@ class AdafruitIO_AIRLIFT : public AdafruitIO {
 
       WiFi.begin(_ssid, _pass);
       _status = AIO_NET_DISCONNECTED;
+      }
   }
 };
 

src/wifi/AdafruitIO_ESP32.cpp

@@ -32,11 +32,16 @@ AdafruitIO_ESP32::~AdafruitIO_ESP32()
 
 void AdafruitIO_ESP32::_connect()
 {
+  if(strlen(_ssid) != 0)
+  {
+    WiFi.disconnect();
+    delay(300);
 
   delay(100);
   WiFi.begin(_ssid, _pass);
   delay(100);
   _status = AIO_NET_DISCONNECTED;
+  }
 
 }
 

src/wifi/AdafruitIO_ESP8266.cpp

@@ -33,11 +33,16 @@ AdafruitIO_ESP8266::~AdafruitIO_ESP8266()
 
 void AdafruitIO_ESP8266::_connect()
 {
+  if(strlen(_ssid) != 0)
+  {
+    WiFi.disconnect();
+    delay(300);
 
   delay(100);
   WiFi.begin(_ssid, _pass);
   delay(100);
   _status = AIO_NET_DISCONNECTED;
+  }
 
 }
 

src/wifi/AdafruitIO_MKR1000.cpp

@@ -32,13 +32,18 @@ AdafruitIO_MKR1000::~AdafruitIO_MKR1000()
 
 void AdafruitIO_MKR1000::_connect()
 {
+  if(strlen(_ssid) != 0)
+  {
+    WiFi.disconnect();
+    delay(300);
 
   // no shield? bail
   if(WiFi.status() == WL_NO_SHIELD)
     return;
 
   WiFi.begin(_ssid, _pass);
   _status = AIO_NET_DISCONNECTED;
+  }
 
 }
 

src/wifi/AdafruitIO_WICED.cpp

@@ -32,8 +32,14 @@ AdafruitIO_WICED::~AdafruitIO_WICED()
 
 void AdafruitIO_WICED::_connect()
 {
+  if(strlen(_ssid) != 0)
+  {
+    Feather.disconnect();
+    delay(300);
+
   Feather.connect(_ssid, _pass);
   _status = AIO_NET_DISCONNECTED;
+  }
 }
 
 aio_status_t AdafruitIO_WICED::networkStatus()

src/wifi/AdafruitIO_WINC1500.h

@@ -80,6 +80,10 @@ class AdafruitIO_WINC1500 : public AdafruitIO {
 
     void _connect()
     {
+      if(strlen(_ssid) != 0)
+      {
+        WiFi.disconnect();
+        delay(300);
       WiFi.setPins(_winc_cs, _winc_irq, _winc_rst, _winc_en);
 
       // no shield? bail
@@ -90,6 +94,7 @@ class AdafruitIO_WINC1500 : public AdafruitIO {
 
       WiFi.begin(_ssid, _pass);
       _status = AIO_NET_DISCONNECTED;
+      }
     }
 };