Skip to content

Commit 58fd0c4

Browse files
committed
_status = AIO_SSID_INVALID; if _ssid is blank
1 parent 87c4bc8 commit 58fd0c4

7 files changed

+20
-13
lines changed

src/AdafruitIO_Definitions.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ typedef enum {
107107
AIO_CONNECT_FAILED = 11, // Failed to connect to Adafruit IO
108108
AIO_FINGERPRINT_INVALID = 12, // Unknown AIO_SSL_FINGERPRINT
109109
AIO_AUTH_FAILED = 13, // Invalid Adafruit IO login credentials provided.
110+
AIO_SSID_INVALID = 14, // SSID is "" or otherwise invalid, connection not attempted
110111

111112
// SUCCESS
112113
AIO_NET_CONNECTED = 20, // Connected to Adafruit IO

src/wifi/AdafruitIO_AIRLIFT.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,9 @@ class AdafruitIO_AIRLIFT : public AdafruitIO {
158158
/**************************************************************************/
159159
void _connect()
160160
{
161-
if(strlen(_ssid) != 0)
162-
{
161+
if(strlen(_ssid) == 0) {
162+
_status = AIO_SSID_INVALID;
163+
} else {
163164
_disconnect();
164165
// setup ESP32 pins
165166
if (_ssPin != -1) {

src/wifi/AdafruitIO_ESP32.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ AdafruitIO_ESP32::~AdafruitIO_ESP32()
3434

3535
void AdafruitIO_ESP32::_connect()
3636
{
37-
if(strlen(_ssid) != 0)
38-
{
37+
if(strlen(_ssid) == 0) {
38+
_status = AIO_SSID_INVALID;
39+
} else {
3940
_disconnect();
4041
delay(100);
4142
WiFi.begin(_ssid, _pass);

src/wifi/AdafruitIO_ESP8266.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ AdafruitIO_ESP8266::~AdafruitIO_ESP8266()
3636

3737
void AdafruitIO_ESP8266::_connect()
3838
{
39-
if(strlen(_ssid) != 0)
40-
{
39+
if(strlen(_ssid) == 0) {
40+
_status = AIO_SSID_INVALID;
41+
} else {
4142
_disconnect();
4243
delay(100);
4344
WiFi.begin(_ssid, _pass);

src/wifi/AdafruitIO_MKR1000.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ AdafruitIO_MKR1000::~AdafruitIO_MKR1000()
3535

3636
void AdafruitIO_MKR1000::_connect()
3737
{
38-
if(strlen(_ssid) != 0)
39-
{
38+
if(strlen(_ssid) == 0) {
39+
_status = AIO_SSID_INVALID;
40+
} else {
4041
// no shield? bail
4142
if(WiFi.status() == WL_NO_SHIELD)
4243
return;

src/wifi/AdafruitIO_WICED.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ AdafruitIO_WICED::~AdafruitIO_WICED()
3535

3636
void AdafruitIO_WICED::_connect()
3737
{
38-
if(strlen(_ssid) != 0)
39-
{
38+
if(strlen(_ssid) == 0) {
39+
_status = AIO_SSID_INVALID;
40+
} else {
4041
_disconnect();
4142
Feather.connect(_ssid, _pass);
4243
_status = AIO_NET_DISCONNECTED;

src/wifi/AdafruitIO_WINC1500.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,9 @@ class AdafruitIO_WINC1500 : public AdafruitIO {
129129
/**************************************************************************/
130130
void _connect()
131131
{
132-
if(strlen(_ssid) != 0)
133-
{
132+
if(strlen(_ssid) == 0) {
133+
_status = AIO_SSID_INVALID;
134+
} else {
134135
_disconnect();
135136
WiFi.setPins(_winc_cs, _winc_irq, _winc_rst, _winc_en);
136137

@@ -142,7 +143,7 @@ class AdafruitIO_WINC1500 : public AdafruitIO {
142143

143144
WiFi.begin(_ssid, _pass);
144145
_status = AIO_NET_DISCONNECTED;
145-
}
146+
}
146147
}
147148

148149
/**************************************************************************/

0 commit comments

Comments
 (0)