Skip to content

[WiFiScan] Fix clear 'scanning bit' and clear scanCount #11075

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

Closed
wants to merge 1 commit into from
Closed

[WiFiScan] Fix clear 'scanning bit' and clear scanCount #11075

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
10 changes: 6 additions & 4 deletions libraries/WiFi/src/WiFiScan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,6 @@ int16_t WiFiScanClass::scanComplete() {
return WiFiScanClass::_scanCount;
}

if (WiFiGenericClass::getStatusBits() & WIFI_SCANNING_BIT) {
return WIFI_SCAN_RUNNING;
}
// last one to avoid time affecting Async mode
if (WiFiScanClass::_scanStarted
&& (millis() - WiFiScanClass::_scanStarted)
Expand All @@ -171,6 +168,10 @@ int16_t WiFiScanClass::scanComplete() {
return WIFI_SCAN_FAILED;
}

if (WiFiGenericClass::getStatusBits() & WIFI_SCANNING_BIT) {
return WIFI_SCAN_RUNNING;
}

return WIFI_SCAN_FAILED;
}

Expand All @@ -179,11 +180,12 @@ int16_t WiFiScanClass::scanComplete() {
*/
void WiFiScanClass::scanDelete() {
WiFiGenericClass::clearStatusBits(WIFI_SCAN_DONE_BIT);
WiFiGenericClass::clearStatusBits(WIFI_SCANNING_BIT);
if (WiFiScanClass::_scanResult) {
delete[] reinterpret_cast<wifi_ap_record_t *>(WiFiScanClass::_scanResult);
WiFiScanClass::_scanResult = nullptr;
WiFiScanClass::_scanCount = 0;
}
WiFiScanClass::_scanCount = 0;
}

/**
Expand Down
Loading