adafruit-mirror/Adafruit_IO_Arduino
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Revert "Test for non-empty SSID before connecting""

Browse source 
This reverts commit 0edd235a4c.
This commit is contained in:
Rick Sellens 2019-12-27 11:24:17 -05:00
parent c7597668ee
commit 73459dcf62
6 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/wifi/AdafruitIO_AIRLIFT.h
View file

@ -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;
}
}
};

5
src/wifi/AdafruitIO_ESP32.cpp
View file

@ -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;
}
}

5
src/wifi/AdafruitIO_ESP8266.cpp
View file

@ -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;
}
}

5
src/wifi/AdafruitIO_MKR1000.cpp
View file

@ -32,6 +32,10 @@ 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)
@ -39,6 +43,7 @@ void AdafruitIO_MKR1000::_connect()
WiFi.begin(_ssid, _pass);
_status = AIO_NET_DISCONNECTED;
}
}

6
src/wifi/AdafruitIO_WICED.cpp
View file

@ -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()

5
src/wifi/AdafruitIO_WINC1500.h
View file

@ -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;
}
}
};