llawall
diff --git a/‎cpp_utils/WiFi.cpp
Lines changed: 10 additions & 9 deletions b/‎cpp_utils/WiFi.cpp
Lines changed: 10 additions & 9 deletions
diff --git a/‎cpp_utils/WiFi.h
Lines changed: 2 additions & 2 deletions b/‎cpp_utils/WiFi.h
Lines changed: 2 additions & 2 deletions
@@ -55,7 +55,7 @@ WiFi::WiFi()
 	m_eventLoopStarted  = false;
 	m_initCalled        = false;
 	//m_pWifiEventHandler = new WiFiEventHandler();
-	m_apConnected       = false;    // Are we connected to an access point?
+	m_apConnectionStatus       = UINT8_MAX;    // Are we connected to an access point?
 } // WiFi
 
 
@@ -153,12 +153,12 @@ void WiFi::setDNSServer(int numdns, ip_addr_t ip) {
  * @param [in] ssid The network SSID of the access point to which we wish to connect.
  * @param [in] password The password of the access point to which we wish to connect.
  * @param [in] waitForConnection Block until the connection has an outcome.
- * @return N/A.
+ * @returns ESP_OK if successfully connected to an access point.  Otherwise returns wifi_err_reason_t - use GeneralUtils::wifiErrorToString(uint8_t errCode) to print the error.
  */
-bool WiFi::connectAP(const std::string& ssid, const std::string& password, bool waitForConnection){
+uint8_t WiFi::connectAP(const std::string& ssid, const std::string& password, bool waitForConnection){
 	ESP_LOGD(LOG_TAG, ">> connectAP");
 
-	m_apConnected = false;
+	m_apConnectionStatus = UINT8_MAX;
 	init();
 
 	if (ip != 0 && gw != 0 && netmask != 0) {
@@ -206,7 +206,7 @@ bool WiFi::connectAP(const std::string& ssid, const std::string& password, bool
     m_connectFinished.give();
 
 	ESP_LOGD(LOG_TAG, "<< connectAP");
-	return m_apConnected;  // Return true if we are now connected and false if not.
+	return m_apConnectionStatus;  // Return ESP_OK if we are now connected and wifi_err_reason_t if not.
 } // connectAP
 
 
@@ -228,7 +228,7 @@ void WiFi::dump() {
  * @brief Returns whether wifi is connected to an access point
  */
 bool WiFi::isConnectedToAP() {
-	return m_apConnected;
+	return m_apConnectionStatus;
 } // isConnected
 
 
@@ -255,10 +255,11 @@ bool WiFi::isConnectedToAP() {
 	// If the event we received indicates that we now have an IP address or that a connection was disconnected then unlock the mutex that
 	// indicates we are waiting for a connection complete.
 	if (event->event_id == SYSTEM_EVENT_STA_GOT_IP || event->event_id == SYSTEM_EVENT_STA_DISCONNECTED) {
-		if (event->event_id == SYSTEM_EVENT_STA_GOT_IP) {  // If we connected and have an IP, change the flag.
-			pWiFi->m_apConnected = true;
+
+		if (event->event_id == SYSTEM_EVENT_STA_GOT_IP) {  // If we connected and have an IP, change the status to ESP_OK.  Otherwise, change it to the reason code.
+			pWiFi->m_apConnectionStatus = ESP_OK;
 		} else {
-			pWiFi->m_apConnected = false;
+			pWiFi->m_apConnectionStatus = event->event_info.disconnected.reason;
 		}
 	}
 
@@ -116,7 +116,7 @@ class WiFi {
     uint8_t             m_dnsCount=0;
     bool                m_eventLoopStarted;
     bool                m_initCalled;
-    bool                m_apConnected;   // Are we connected to an access point?
+    uint8_t             m_apConnectionStatus;   // ESP_OK = we are connected to an access point.  Otherwise receives wifi_err_reason_t.
   	FreeRTOS::Semaphore m_connectFinished = FreeRTOS::Semaphore("ConnectFinished");
 
 public:
@@ -130,7 +130,7 @@ class WiFi {
     void                      setDNSServer(int numdns, ip_addr_t ip);
     struct in_addr            getHostByName(const std::string& hostName);
     struct in_addr            getHostByName(const char* hostName);
-    bool                      connectAP(const std::string& ssid, const std::string& password, bool waitForConnection=true);
+    uint8_t                   connectAP(const std::string& ssid, const std::string& password, bool waitForConnection=true);
     void                      dump();
     bool                      isConnectedToAP();
     static std::string        getApMac();