From cb02e72123cf6154d3382a6ea465d930fc388fb1 Mon Sep 17 00:00:00 2001 From: Shawn A Date: Sat, 27 Jan 2018 14:31:28 -0600 Subject: [PATCH] fix esp8366 bug --- WiFiManager.cpp | 16 +++++++++------- WiFiManager.h | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/WiFiManager.cpp b/WiFiManager.cpp index 4c8f2e0..48b77cd 100644 --- a/WiFiManager.cpp +++ b/WiFiManager.cpp @@ -213,7 +213,7 @@ void WiFiManager::setupConfigPortal() { // setup dns and web servers dnsServer.reset(new DNSServer()); - #ifdef WEBSERVERSHIM + #if defined(ESP32) && defined(WEBSERVERSHIM) server.reset(new WebServer(80)); #else server.reset(new ESP8266WebServer(80)); @@ -1613,12 +1613,14 @@ String WiFiManager::WiFi_SSID(){ } void WiFiManager::WiFiEvent(WiFiEvent_t event){ - WiFiManager _WiFiManager; - if(event == SYSTEM_EVENT_STA_DISCONNECTED){ - // Serial.println("Event: SYSTEM_EVENT_STA_DISCONNECTED, reconnecting"); - _WiFiManager.DEBUG_WM("ESP32 Event: SYSTEM_EVENT_STA_DISCONNECTED, reconnecting"); // @todo remove debugging from prod, or change static method - WiFi.reconnect(); - } + #ifdef ESP32 + WiFiManager _WiFiManager; + if(event == SYSTEM_EVENT_STA_DISCONNECTED){ + // Serial.println("Event: SYSTEM_EVENT_STA_DISCONNECTED, reconnecting"); + _WiFiManager.DEBUG_WM("ESP32 Event: SYSTEM_EVENT_STA_DISCONNECTED, reconnecting"); // @todo remove debugging from prod, or change static method + WiFi.reconnect(); + } + #endif } void WiFiManager::WiFi_autoReconnect(){ diff --git a/WiFiManager.h b/WiFiManager.h index f1db39d..82f88b7 100644 --- a/WiFiManager.h +++ b/WiFiManager.h @@ -185,7 +185,7 @@ class WiFiManager private: std::unique_ptr dnsServer; - #if defined(WEBSERVERSHIM) && defined(ESP32) + #if defined(ESP32) && defined(WEBSERVERSHIM) std::unique_ptr server; #else std::unique_ptr server;