8000 Additional to PR #475. Addresses BootWiFi::boot hanging by Brisdo · Pull Request #497 · nkolban/esp32-snippets · GitHub
[go: up one dir, main page]
Skip to content

Additional to PR #475. Addresses BootWiFi::boot hanging #497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 24, 2018
Merged

Additional to PR #475. Addresses BootWiFi::boot hanging #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions networking/bootwifi/BootWiFi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ class BootWifiEventHandler: public WiFiEventHandler {

esp_err_t staGotIp(system_event_sta_got_ip_t event_sta_got_ip) {
ESP_LOGD("BootWifiEventHandler", ">> staGotIP");
m_pBootWiFi->m_apConnectionStatus = ESP_OK; // Set the status to ESP_OK
m_pBootWiFi->m_completeSemaphore.give(); // If we got an IP address, then we can end the boot process.
ESP_LOGD("BootWifiEventHandler", "<< staGotIP");
return ESP_OK;
Expand All @@ -255,6 +256,11 @@ class BootWifiEventHandler: public WiFiEventHandler {

/**
* Boot WiFi
*
* @brief Get connected to WiFi
*
* @detailed If SSID & Password were previously saved, connect to the AP. Otherwise become an AP and start an HTTP server so that the user can set SSID & Password - then save it.
*
*/
void BootWiFi::bootWiFi2() {
ESP_LOGD(LOG_TAG, ">> bootWiFi2");
Expand Down Expand Up @@ -286,10 +292,8 @@ void BootWiFi::bootWiFi2() {
connectionInfo.ipInfo.netmask.addr
);

// Connect to the access point.
while(!m_wifi.connectAP(connectionInfo.ssid, connectionInfo.password)){
ESP_LOGE(LOG_TAG, "Unable to connect to access point \"%s\" - trying again...", connectionInfo.ssid);
};
m_apConnectionStatus = m_wifi.connectAP(connectionInfo.ssid, connectionInfo.password); // Try to connect to the access point.
m_completeSemaphore.give(); // end the boot process so we don't hang...

} else {
// We do NOT have connection information. Let us now become an access
Expand All @@ -316,22 +320,28 @@ void BootWiFi::setAccessPointCredentials(std::string ssid, std::string password)


/**
* @brief Main entry point into booting WiFi
* @brief Main entry point into booting WiFi - see BootWiFi2 for more detail.
*
* The event handler will be called back with the outcome of the connection.
*
* @returns ESP_OK if successfully connected to an access point. Otherwise returns wifi_err_reason_t - to print use GeneralUtils::wifiErrorToString
*/
void BootWiFi::boot() {
uint8_t 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_wifi.setWifiEventHandler(nullptr); // Remove the WiFi boot handler when we have completed booting.
ESP_LOGD(LOG_TAG, "<< boot");
return m_apConnectionStatus;
} // boot

BootWiFi::BootWiFi() {
m_httpServerStarted = false;
m_apConnectionStatus = UINT8_MAX;
setAccessPointCredentials("esp32", "password"); // Default access point credentials
}
3 changes: 2 additions & 1 deletion networking/bootwifi/BootWiFi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ class BootWiFi {
bool m_httpServerStarted;
std::string m_ssid;
std::string m_password;
uint8_t m_apConnectionStatus; // receives the connection status. ESP_OK = received SYSTEM_EVENT_STA_GOT_IP event.
FreeRTOS::Semaphore m_completeSemaphore = FreeRTOS::Semaphore("completeSemaphore");

public:
BootWiFi();
void setAccessPointCredentials(std::string ssid, std::string password);
void boot();
uint8_t boot();
};

#endif /* MAIN_BOOTWIFI_H_ */
0