nkolban#179

nkolban · nkolban · commit a7066c3dfd4f · 2017-11-08T20:36:56.000-06:00
diff --git a/cpp_utils/I2C.cpp b/cpp_utils/I2C.cpp
@@ -97,7 +97,7 @@ uint8_t I2C::getAddress() const
  */
 void I2C::init(uint8_t address, gpio_num_t sdaPin, gpio_num_t sclPin, uint32_t clockSpeed, i2c_port_t portNum) {
 	ESP_LOGD(LOG_TAG, ">> I2c::init.  address=%d, sda=%d, scl=%d, clockSpeed=%d, portNum=%d", address, sdaPin, sclPin, clockSpeed, portNum);
-	asser(portNum < I2C_NUM_MAX);
+	assert(portNum < I2C_NUM_MAX);
 	m_portNum = portNum;
 	m_sdaPin  = sdaPin;
 	m_sclPin  = sclPin;
diff --git a/cpp_utils/WiFi.cpp b/cpp_utils/WiFi.cpp
@@ -187,13 +187,15 @@ void WiFi::connectAP(const std::string& ssid, const std::string& password, bool
 		abort();
 	}
 
-	m_gotIpEvt.take("connectAP");
+	m_connectFinished.take("connectAP");   // Take the semaphore to wait for a connection.
+
 	errRc = ::esp_wifi_connect();
 	if (errRc != ESP_OK) {
 		ESP_LOGE(LOG_TAG, "esp_wifi_connect: rc=%d %s", errRc, GeneralUtils::errorToString(errRc));
 		abort();
 	}
-	m_gotIpEvt.wait("connectAP");
+
+	m_connectFinished.wait("connectAP");   // Wait for the completion of the connection.
 	ESP_LOGD(LOG_TAG, "<< connectAP");
 } // connectAP
 
@@ -226,11 +228,12 @@ void WiFi::dump() {
 	// Invoke the event handler.
 	esp_err_t rc = pWiFi->m_pWifiEventHandler->getEventHandler()(pWiFi->m_pWifiEventHandler, event);
 
-	// If the event we received indicates that we now have an IP address then unlock the mutex that
-	// indicates we are waiting for an IP.
-	if (event->event_id == SYSTEM_EVENT_STA_GOT_IP) {
-		pWiFi->m_gotIpEvt.give();
+	// 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) {
+		pWiFi->m_connectFinished.give();
 	}
+
 	return rc;
 } // eventHandler
 
diff --git a/cpp_utils/WiFi.h b/cpp_utils/WiFi.h
@@ -114,7 +114,7 @@ class WiFi {
     uint8_t             m_dnsCount=0;
     bool                m_eventLoopStarted;
     bool                m_initCalled;
-  	FreeRTOS::Semaphore m_gotIpEvt = FreeRTOS::Semaphore("GotIpEvt");
+  	FreeRTOS::Semaphore m_connectFinished = FreeRTOS::Semaphore("ConnectFinished");
 
 public:
     WiFi();
