Update WiFiMulti.cpp (espressif#1220)

c0zm0z · me-no-dev · commit 2ded419486a6 · 2018-04-06T19:10:06.000+03:00
* Update WiFiMulti.cpp

added 5 sec timeout from ESP8266

* Update WiFiMulti.cpp

* Update WiFiMulti.h
diff --git a/libraries/WiFi/src/WiFiMulti.cpp b/libraries/WiFi/src/WiFiMulti.cpp
@@ -42,7 +42,7 @@ bool WiFiMulti::addAP(const char* ssid, const char *passphrase)
     return APlistAdd(ssid, passphrase);
 }
 
-uint8_t WiFiMulti::run(void)
+uint8_t WiFiMulti::run(uint32_t connectTimeout)
 {
 
     int8_t scanResult;
@@ -117,9 +117,10 @@ uint8_t WiFiMulti::run(void)
 
                 WiFi.begin(bestNetwork.ssid, bestNetwork.passphrase, bestChannel, bestBSSID);
                 status = WiFi.status();
-
-                // wait for connection or fail
-                while(status != WL_CONNECTED && status != WL_NO_SSID_AVAIL && status != WL_CONNECT_FAILED) {
+                
+                auto startTime = millis();
+                // wait for connection, fail, or timeout
+                while(status != WL_CONNECTED && status != WL_NO_SSID_AVAIL && status != WL_CONNECT_FAILED && (millis() - startTime) <= connectTimeout) {
                     delay(10);
                     status = WiFi.status();
                 }
diff --git a/libraries/WiFi/src/WiFiMulti.h b/libraries/WiFi/src/WiFiMulti.h
@@ -54,7 +54,7 @@ class WiFiMulti
 
     bool addAP(const char* ssid, const char *passphrase = NULL);
 
-    uint8_t run(void);
+    uint8_t run(uint32_t connectTimeout=5000);
 
 private:
     std::vector<WifiAPlist_t> APlist;

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ bool WiFiMulti::addAP(const char* ssid, const char *passphrase)`
`42`	`42`	`return APlistAdd(ssid, passphrase);`
`43`	`43`	`}`
`44`	`44`
`45`		`-uint8_t WiFiMulti::run(void)`
	`45`	`+uint8_t WiFiMulti::run(uint32_t connectTimeout)`
`46`	`46`	`{`
`47`	`47`
`48`	`48`	`int8_t scanResult;`
`@@ -117,9 +117,10 @@ uint8_t WiFiMulti::run(void)`
`117`	`117`
`118`	`118`	`WiFi.begin(bestNetwork.ssid, bestNetwork.passphrase, bestChannel, bestBSSID);`
`119`	`119`	`status = WiFi.status();`
`120`		`-`
`121`		`- // wait for connection or fail`
`122`		`- while(status != WL_CONNECTED && status != WL_NO_SSID_AVAIL && status != WL_CONNECT_FAILED) {`
	`120`	`+`
	`121`	`+ auto startTime = millis();`
	`122`	`+ // wait for connection, fail, or timeout`
	`123`	`+ while(status != WL_CONNECTED && status != WL_NO_SSID_AVAIL && status != WL_CONNECT_FAILED && (millis() - startTime) <= connectTimeout) {`
`123`	`124`	`delay(10);`
`124`	`125`	`status = WiFi.status();`
`125`	`126`	`}`