Changes for #389

Author: nkolban

cpp_utils/WiFi.cpp

@@ -54,16 +54,20 @@ WiFi::WiFi()
 {
 	m_eventLoopStarted  = false;
 	m_initCalled        = false;
-	m_pWifiEventHandler = new WiFiEventHandler();
+	//m_pWifiEventHandler = new WiFiEventHandler();
 	m_apConnected       = false;    // Are we connected to an access point?
 } // WiFi
 
+
 /**
  * @brief Deletes the event handler that was used by the class
  */
 WiFi::~WiFi() {
-	delete m_pWifiEventHandler;
-}
+	if (m_pWifiEventHandler != nullptr) {
+		delete m_pWifiEventHandler;
+		m_pWifiEventHandler = nullptr;
+	}
+} // ~WiFi
 
 
 /**
@@ -229,7 +233,12 @@ void WiFi::dump() {
 	WiFi *pWiFi = (WiFi *)ctx;   // retrieve the WiFi object from the passed in context.
 
 	// Invoke the event handler.
-	esp_err_t rc = pWiFi->m_pWifiEventHandler->getEventHandler()(pWiFi->m_pWifiEventHandler, event);
+	esp_err_t rc;
+	if (pWiFi->m_pWifiEventHandler != nullptr) {
+		rc = pWiFi->m_pWifiEventHandler->getEventHandler()(pWiFi->m_pWifiEventHandler, event);
+	} else {
+		rc = ESP_OK;
+	}
 
 	// 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.

networking/bootwifi/BootWiFi.cpp

@@ -253,8 +253,12 @@ class BootWifiEventHandler: public WiFiEventHandler {
 };
 
 
+/**
+ * Boot WiFi
+ */
 void BootWiFi::bootWiFi2() {
 	ESP_LOGD(LOG_TAG, ">> bootWiFi2");
+
 	// Check for a GPIO override which occurs when a physical Pin is high
 	// during the test.  This can force the ability to check for new configuration
 	// even if the existing configured access point is available.
@@ -306,17 +310,22 @@ void BootWiFi::setAccessPointCredentials(std::string ssid, std::string password)
 } // setAccessPointCredentials
 
 
+
+/**
+ * @brief Main entry point into booting WiFi
+ */
 void BootWiFi::boot() {
 	ESP_LOGD(LOG_TAG, ">> boot");
 	ESP_LOGD(LOG_TAG, " +----------+");
 	ESP_LOGD(LOG_TAG, " | BootWiFi |");
 	ESP_LOGD(LOG_TAG, " +----------+");
 	ESP_LOGD(LOG_TAG, " Access point credentials: %s/%s", m_ssid.c_str(), m_password.c_str());
-	m_completeSemaphore.take("boot");   // Take the semaphore which will be unlocked when we complete booting.
+	m_completeSemaphore.take("boot");     // Take the semaphore which will be unlocked when we complete booting.
 	bootWiFi2();
-	m_completeSemaphore.wait("boot");   // Wait for the semaphore that indicated we have completed booting.
+	m_completeSemaphore.wait("boot");     // Wait for the semaphore that indicated we have completed booting.
+	m_wifi.setWifiEventHandler(nullptr);  // Remove the WiFi boot handler when we have completed booting.
 	ESP_LOGD(LOG_TAG, "<< boot");
-}
+} // boot
 
 BootWiFi::BootWiFi() {
 	m_httpServerStarted = false;