Skip to content

WiFi._status condition expressions fix #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WiFi._status condition expressions fix #324

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/WiFi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,14 +381,14 @@ uint8_t WiFiClass::begin()
for (unsigned long start = millis(); millis() - start < _timeout;)
{
m2m_wifi_handle_events(NULL);
if ((_status & WL_CONNECTED) || (_status & WL_DISCONNECTED)) {
if ((_status == WL_CONNECTED) || (_status == WL_DISCONNECTED)) {
break;
}
}

memset(_ssid, 0, M2M_MAX_SSID_LEN);

if (!(_status & WL_CONNECTED)) {
if (!(_status == WL_CONNECTED)) {
_mode = WL_RESET_MODE;
} else {
m2m_wifi_get_connection_info();
Expand Down Expand Up @@ -443,11 +443,11 @@ uint8_t WiFiClass::startConnect(const char *ssid, uint8_t u8SecType, const void
for (unsigned long start = millis(); millis() - start < _timeout;)
{
m2m_wifi_handle_events(NULL);
if ((_status & WL_CONNECTED) || (_status & WL_DISCONNECTED)) {
if ((_status == WL_CONNECTED) || (_status == WL_DISCONNECTED)) {
break;
}
}
if (!(_status & WL_CONNECTED)) {
if (_status != WL_CONNECTED) {
_mode = WL_RESET_MODE;
}

Expand Down Expand Up @@ -853,7 +853,7 @@ int8_t WiFiClass::scanNetworks()
// Wait for scan result or timeout:
_status = WL_IDLE_STATUS;
unsigned long start = millis();
while (!(_status & WL_SCAN_COMPLETED) && millis() - start < 5000) {
while ((_status != WL_SCAN_COMPLETED) && millis() - start < 5000) {
m2m_wifi_handle_events(NULL);
}
_status = tmp;
Expand All @@ -873,7 +873,7 @@ char* WiFiClass::SSID(uint8_t pos)
// Wait for connection or timeout:
_status = WL_IDLE_STATUS;
unsigned long start = millis();
while (!(_status & WL_SCAN_COMPLETED) && millis() - start < 2000) {
while ((_status != WL_SCAN_COMPLETED) && millis() - start < 2000) {
m2m_wifi_handle_events(NULL);
}

Expand All @@ -895,7 +895,7 @@ int32_t WiFiClass::RSSI(uint8_t pos)
// Wait for connection or timeout:
_status = WL_IDLE_STATUS;
unsigned long start = millis();
while (!(_status & WL_SCAN_COMPLETED) && millis() - start < 2000) {
while ((_status != WL_SCAN_COMPLETED) && millis() - start < 2000) {
m2m_wifi_handle_events(NULL);
}

Expand Down Expand Up @@ -934,7 +934,7 @@ uint8_t WiFiClass::encryptionType(uint8_t pos)
// Wait for connection or timeout:
_status = WL_IDLE_STATUS;
unsigned long start = millis();
while (!(_status & WL_SCAN_COMPLETED) && millis() - start < 2000) {
while ((_status != WL_SCAN_COMPLETED) && millis() - start < 2000) {
m2m_wifi_handle_events(NULL);
}

Expand All @@ -958,7 +958,7 @@ uint8_t* WiFiClass::BSSID(uint8_t pos, uint8_t* bssid)
// Wait for connection or timeout:
_status = WL_IDLE_STATUS;
unsigned long start = millis();
while (!(_status & WL_SCAN_COMPLETED) && millis() - start < 2000) {
while ((_status != WL_SCAN_COMPLETED) && millis() - start < 2000) {
m2m_wifi_handle_events(NULL);
}

Expand Down