Skip to content

Added timeout to WiFiScan.cpp to prevent getting stuck at WIFI_SCAN_RUNNING #3197

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

Merged
merged 6 commits into from
Sep 11, 2019
Merged

Added timeout to WiFiScan.cpp to prevent getting stuck at WIFI_SCAN_RUNNING #3197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d6ca2a1
Added timeout to WiFiScan class to prevent haning at stucking at WIFI…
EricMc1289 Sep 11, 2019
1ca0c07
fixed tabs and returns, connected scanTimeout to max_scan_per_channel…
EricMc1289 Sep 11, 2019
395f6bf
Corrected tabs two
EricMc1289 Sep 11, 2019
918e044
Added static vars scanTimeout und scanStarted to WiFiScan.h protected…
EricMc1289 Sep 11, 2019
1eccb7b
Fixed missing ; in line 64
EricMc1289 Sep 11, 2019
89d5bf1
Merge branch 'master' into WiFi_Scan_Fix
me-no-dev Sep 11, 2019
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
16 changes: 15 additions & 1 deletion libraries/WiFi/src/WiFiScan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

*/


#include "WiFi.h"
#include "WiFiGeneric.h"
#include "WiFiScan.h"
Expand All @@ -42,7 +43,8 @@ extern "C" {
}

bool WiFiScanClass::_scanAsync = false;

uint32_t WiFiScanClass::_scanStarted = 0;
uint32_t WiFiScanClass::_scanTimeout = 10000;
uint16_t WiFiScanClass::_scanCount = 0;
void* WiFiScanClass::_scanResult = 0;

Expand All @@ -58,6 +60,7 @@ int16_t WiFiScanClass::scanNetworks(bool async, bool show_hidden, bool passive,
return WIFI_SCAN_RUNNING;
}

WiFiScanClass::_scanTimeout = max_ms_per_chan * 20;
WiFiScanClass::_scanAsync = async;

WiFi.enableSTA(true);
Expand All @@ -78,6 +81,11 @@ int16_t WiFiScanClass::scanNetworks(bool async, bool show_hidden, bool passive,
config.scan_time.active.max = max_ms_per_chan;
}
if(esp_wifi_scan_start(&config, false) == ESP_OK) {
_scanStarted = millis();
if (!_scanStarted) { //Prevent 0 from millis overflow
++_scanStarted;
}

WiFiGenericClass::clearStatusBits(WIFI_SCAN_DONE_BIT);
WiFiGenericClass::setStatusBits(WIFI_SCANNING_BIT);

Expand Down Expand Up @@ -107,6 +115,7 @@ void WiFiScanClass::_scanDone()
WiFiScanClass::_scanCount = 0;
}
}
WiFiScanClass::_scanStarted=0; //Reset after a scan is completed for normal behavior
WiFiGenericClass::setStatusBits(WIFI_SCAN_DONE_BIT);
WiFiGenericClass::clearStatusBits(WIFI_SCANNING_BIT);
}
Expand All @@ -132,6 +141,11 @@ void * WiFiScanClass::_getScanInfoByIndex(int i)
*/
int16_t WiFiScanClass::scanComplete()
{
if (WiFiScanClass::_scanStarted && (millis()-WiFiScanClass::_scanStarted) > WiFiScanClass::_scanTimeout) { //Check is scan was started and if the delay expired, return WIFI_SCAN_FAILED in this case
WiFiGenericClass::clearStatusBits(WIFI_SCANNING_BIT);
return WIFI_SCAN_FAILED;
}

if(WiFiGenericClass::getStatusBits() & WIFI_SCAN_DONE_BIT) {
return WiFiScanClass::_scanCount;
}
Expand Down
5 changes: 4 additions & 1 deletion libraries/WiFi/src/WiFiScan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,11 @@ class WiFiScanClass
protected:

static bool _scanAsync;


static uint32_t _scanStarted;
static uint32_t _scanTimeout;
static uint16_t _scanCount;

static void* _scanResult;

static void * _getScanInfoByIndex(int i);
Expand Down