Revert "changed from _disconnect() to _wifi_disconnect()"

sellensr · sellensr · commit 6711e6e2c1d5 · 2020-01-02T14:54:07.000-05:00
This reverts commit 7d4fd8b.
diff --git a/src/AdafruitIO.cpp b/src/AdafruitIO.cpp
@@ -171,7 +171,7 @@ void AdafruitIO::disconnect()
 
   AIO_DEBUG_PRINTLN("AdafruitIO::disconnect()");
   
-  _wifi_disconnect();
+  _disconnect();
 
 }
 
diff --git a/src/AdafruitIO.h b/src/AdafruitIO.h
@@ -76,7 +76,7 @@ class AdafruitIO {
 
   protected:
     virtual void _connect() = 0;
-    virtual void _wifi_disconnect() = 0;
+    virtual void _disconnect() = 0;
     aio_status_t _status = AIO_IDLE;
     uint32_t _last_ping = 0;
     uint32_t _last_mqtt_connect = 0;
diff --git a/src/wifi/AdafruitIO_AIRLIFT.h b/src/wifi/AdafruitIO_AIRLIFT.h
@@ -160,7 +160,7 @@ class AdafruitIO_AIRLIFT : public AdafruitIO {
     {
       if(strlen(_ssid) != 0)
       {
-        _wifi_disconnect();
+        _disconnect();
         // setup ESP32 pins
         if (_ssPin != -1) {
             WiFi.setPins(_ssPin, _ackPin, _rstPin, _gpio0Pin, _wifi);
@@ -187,7 +187,7 @@ class AdafruitIO_AIRLIFT : public AdafruitIO {
         @return   none
     */
     /**************************************************************************/
-    void _wifi_disconnect()
+    void _disconnect()
     {
       WiFi.disconnect();
       delay(AIO_NET_DISCONNECT_WAIT);
diff --git a/src/wifi/AdafruitIO_ESP32.cpp b/src/wifi/AdafruitIO_ESP32.cpp
@@ -36,7 +36,7 @@ void AdafruitIO_ESP32::_connect()
 {
   if(strlen(_ssid) != 0)
   {
-    _wifi_disconnect();
+    _disconnect();
   delay(100);
   WiFi.begin(_ssid, _pass);
   delay(100);
@@ -51,7 +51,7 @@ void AdafruitIO_ESP32::_connect()
     @return   none
 */
 /**************************************************************************/
-void AdafruitIO_ESP32::_wifi_disconnect()
+void AdafruitIO_ESP32::_disconnect()
 {
   WiFi.disconnect();
   delay(AIO_NET_DISCONNECT_WAIT);
diff --git a/src/wifi/AdafruitIO_ESP32.h b/src/wifi/AdafruitIO_ESP32.h
@@ -35,7 +35,7 @@ class AdafruitIO_ESP32 : public AdafruitIO {
 
   protected:
     void _connect();
-    void _wifi_disconnect();
+    void _disconnect();
 
     const char *_ssid;
     const char *_pass;
diff --git a/src/wifi/AdafruitIO_ESP8266.cpp b/src/wifi/AdafruitIO_ESP8266.cpp
@@ -38,7 +38,7 @@ void AdafruitIO_ESP8266::_connect()
 {
   if(strlen(_ssid) != 0)
   {
-    _wifi_disconnect();
+    _disconnect();
   delay(100);
   WiFi.begin(_ssid, _pass);
   delay(100);
@@ -53,7 +53,7 @@ void AdafruitIO_ESP8266::_connect()
     @return   none
 */
 /**************************************************************************/
-void AdafruitIO_ESP8266::_wifi_disconnect()
+void AdafruitIO_ESP8266::_disconnect()
 {
   WiFi.disconnect();
   delay(AIO_NET_DISCONNECT_WAIT);
diff --git a/src/wifi/AdafruitIO_ESP8266.h b/src/wifi/AdafruitIO_ESP8266.h
@@ -35,7 +35,7 @@ class AdafruitIO_ESP8266 : public AdafruitIO {
 
   protected:
     void _connect();
-    void _wifi_disconnect();
+    void _disconnect();
 
     const char *_ssid;
     const char *_pass;
diff --git a/src/wifi/AdafruitIO_MKR1000.cpp b/src/wifi/AdafruitIO_MKR1000.cpp
@@ -41,7 +41,7 @@ void AdafruitIO_MKR1000::_connect()
   if(WiFi.status() == WL_NO_SHIELD)
     return;
 
-    _wifi_disconnect();
+    _disconnect();
 
   WiFi.begin(_ssid, _pass);
   _status = AIO_NET_DISCONNECTED;
@@ -55,7 +55,7 @@ void AdafruitIO_MKR1000::_connect()
     @return   none
 */
 /**************************************************************************/
-void AdafruitIO_MKR1000::_wifi_disconnect()
+void AdafruitIO_MKR1000::_disconnect()
 {
   WiFi.disconnect();
   delay(AIO_NET_DISCONNECT_WAIT);
diff --git a/src/wifi/AdafruitIO_MKR1000.h b/src/wifi/AdafruitIO_MKR1000.h
@@ -36,7 +36,7 @@ class AdafruitIO_MKR1000 : public AdafruitIO {
 
   protected:
     void _connect();
-    void _wifi_disconnect();
+    void _disconnect();
 
     const char *_ssid;
     const char *_pass;
diff --git a/src/wifi/AdafruitIO_WICED.cpp b/src/wifi/AdafruitIO_WICED.cpp
@@ -37,7 +37,7 @@ void AdafruitIO_WICED::_connect()
 {
   if(strlen(_ssid) != 0)
   {
-    _wifi_disconnect();
+    _disconnect();
   Feather.connect(_ssid, _pass);
   _status = AIO_NET_DISCONNECTED;
   }
@@ -49,7 +49,7 @@ void AdafruitIO_WICED::_connect()
     @return   none
 */
 /**************************************************************************/
-void AdafruitIO_WICED::_wifi_disconnect()
+void AdafruitIO_WICED::_disconnect()
 {
   Feather.disconnect();
   delay(AIO_NET_DISCONNECT_WAIT);
diff --git a/src/wifi/AdafruitIO_WICED.h b/src/wifi/AdafruitIO_WICED.h
@@ -35,7 +35,7 @@ class AdafruitIO_WICED : public AdafruitIO {
 
   protected:
     void _connect();
-    void _wifi_disconnect();
+    void _disconnect();
     const char *_ssid;
     const char *_pass;
     AdafruitIO_WICED_SSL *_client;
diff --git a/src/wifi/AdafruitIO_WINC1500.h b/src/wifi/AdafruitIO_WINC1500.h
@@ -131,7 +131,7 @@ class AdafruitIO_WINC1500 : public AdafruitIO {
     {
       if(strlen(_ssid) != 0)
       {
-        _wifi_disconnect();
+        _disconnect();
       WiFi.setPins(_winc_cs, _winc_irq, _winc_rst, _winc_en);
 
       // no shield? bail
@@ -151,7 +151,7 @@ class AdafruitIO_WINC1500 : public AdafruitIO {
     @return   none
 */
 /**************************************************************************/
-    void _wifi_disconnect()
+    void _disconnect()
     {
       WiFi.disconnect();
       delay(AIO_NET_DISCONNECT_WAIT);

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ void AdafruitIO::disconnect()`
`171`	`171`
`172`	`172`	`AIO_DEBUG_PRINTLN("AdafruitIO::disconnect()");`
`173`	`173`
`174`		`- _wifi_disconnect();`
	`174`	`+ _disconnect();`
`175`	`175`
`176`	`176`	`}`
`177`	`177`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ class AdafruitIO_AIRLIFT : public AdafruitIO {`
`160`	`160`	`{`
`161`	`161`	`if(strlen(_ssid) != 0)`
`162`	`162`	`{`
`163`		`- _wifi_disconnect();`
	`163`	`+ _disconnect();`
`164`	`164`	`// setup ESP32 pins`
`165`	`165`	`if (_ssPin != -1) {`
`166`	`166`	`WiFi.setPins(_ssPin, _ackPin, _rstPin, _gpio0Pin, _wifi);`
`@@ -187,7 +187,7 @@ class AdafruitIO_AIRLIFT : public AdafruitIO {`
`187`	`187`	`@return none`
`188`	`188`	`*/`
`189`	`189`	`/**************************************************************************/`
`190`		`- void _wifi_disconnect()`
	`190`	`+ void _disconnect()`
`191`	`191`	`{`
`192`	`192`	`WiFi.disconnect();`
`193`	`193`	`delay(AIO_NET_DISCONNECT_WAIT);`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ void AdafruitIO_ESP32::_connect()`
`36`	`36`	`{`
`37`	`37`	`if(strlen(_ssid) != 0)`
`38`	`38`	`{`
`39`		`- _wifi_disconnect();`
	`39`	`+ _disconnect();`
`40`	`40`	`delay(100);`
`41`	`41`	`WiFi.begin(_ssid, _pass);`
`42`	`42`	`delay(100);`
`@@ -51,7 +51,7 @@ void AdafruitIO_ESP32::_connect()`
`51`	`51`	`@return none`
`52`	`52`	`*/`
`53`	`53`	`/**************************************************************************/`
`54`		`-void AdafruitIO_ESP32::_wifi_disconnect()`
	`54`	`+void AdafruitIO_ESP32::_disconnect()`
`55`	`55`	`{`
`56`	`56`	`WiFi.disconnect();`
`57`	`57`	`delay(AIO_NET_DISCONNECT_WAIT);`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ void AdafruitIO_ESP8266::_connect()`
`38`	`38`	`{`
`39`	`39`	`if(strlen(_ssid) != 0)`
`40`	`40`	`{`
`41`		`- _wifi_disconnect();`
	`41`	`+ _disconnect();`
`42`	`42`	`delay(100);`
`43`	`43`	`WiFi.begin(_ssid, _pass);`
`44`	`44`	`delay(100);`
`@@ -53,7 +53,7 @@ void AdafruitIO_ESP8266::_connect()`
`53`	`53`	`@return none`
`54`	`54`	`*/`
`55`	`55`	`/**************************************************************************/`
`56`		`-void AdafruitIO_ESP8266::_wifi_disconnect()`
	`56`	`+void AdafruitIO_ESP8266::_disconnect()`
`57`	`57`	`{`
`58`	`58`	`WiFi.disconnect();`
`59`	`59`	`delay(AIO_NET_DISCONNECT_WAIT);`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ void AdafruitIO_WICED::_connect()`
`37`	`37`	`{`
`38`	`38`	`if(strlen(_ssid) != 0)`
`39`	`39`	`{`
`40`		`- _wifi_disconnect();`
	`40`	`+ _disconnect();`
`41`	`41`	`Feather.connect(_ssid, _pass);`
`42`	`42`	`_status = AIO_NET_DISCONNECTED;`
`43`	`43`	`}`
`@@ -49,7 +49,7 @@ void AdafruitIO_WICED::_connect()`
`49`	`49`	`@return none`
`50`	`50`	`*/`
`51`	`51`	`/**************************************************************************/`
`52`		`-void AdafruitIO_WICED::_wifi_disconnect()`
	`52`	`+void AdafruitIO_WICED::_disconnect()`
`53`	`53`	`{`
`54`	`54`	`Feather.disconnect();`
`55`	`55`	`delay(AIO_NET_DISCONNECT_WAIT);`