Merge pull request nkolban#422 from HanVertegaal/Fix-for-issue-#421

nkolban · web-flow · commit 5e0e104ae188 · 2018-03-03T16:34:58.000-06:00
Retry if esp_wifi_connect fails to connect
diff --git a/cpp_utils/WiFi.cpp b/cpp_utils/WiFi.cpp
@@ -194,14 +194,17 @@ bool WiFi::connectAP(const std::string& ssid, const std::string& password, bool
 	}
 
 	m_connectFinished.take("connectAP");   // Take the semaphore to wait for a connection.
+    do {
+        ESP_LOGD(LOG_TAG, "esp_wifi_connect");
+        errRc = ::esp_wifi_connect();
+        if (errRc != ESP_OK) {
+            ESP_LOGE(LOG_TAG, "esp_wifi_connect: rc=%d %s", errRc, GeneralUtils::errorToString(errRc));
+            abort();
+        }
+    }
+    while (!m_connectFinished.take(5000, "connectAP")); // retry if not connected within 5s
+    m_connectFinished.give();
 
-	errRc = ::esp_wifi_connect();
-	if (errRc != ESP_OK) {
-		ESP_LOGE(LOG_TAG, "esp_wifi_connect: rc=%d %s", errRc, GeneralUtils::errorToString(errRc));
-		abort();
-	}
-
-	m_connectFinished.wait("connectAP");   // Wait for the completion of the connection.
 	ESP_LOGD(LOG_TAG, "<< connectAP");
 	return m_apConnected;  // Return true if we are now connected and false if not.
 } // connectAP
