Fix CaptivePortal

mathieucarbou · Feb 28, 2024 · bd4217e · bd4217e
1 parent e12c091
commit bd4217e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -36,7 +36,7 @@ lib_deps =
   mathieucarbou/MycilaHADiscovery @ 1.0.1
   mathieucarbou/MycilaConfig @ 1.4.0
   mathieucarbou/MycilaEasyDisplay @ 1.0.1
-  mathieucarbou/MycilaESPConnect @ 3.2.2
+  mathieucarbou/MycilaESPConnect @ 3.2.3
   mathieucarbou/MycilaJSY @ 6.0.3
   mathieucarbou/MycilaLogger @ 2.2.0
   mathieucarbou/MycilaMQTT @ 3.0.0
@@ -118,11 +118,7 @@ build_flags =
   -ggdb -ggdb3 -g3
   -D CONFIG_ARDUHAL_LOG_COLORS
   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
-  ; -D DEBUG
-  ; -D DEBUG_ESP_MQTT_CLIENT
-  ; -D ENABLE_DEBUG
-  ; -D ESPCONNECT_DEBUG
-  ; -D MYCILA_BOOT_WAIT_FOR_RESET
+  -D ESPCONNECT_PORTAL_TIMEOUT=60
   -D MYCILA_TASK_MANAGER_DEBUG
   -D YASOLR_DEBUG
   -D YASOLR_RELAY_PAUSE_DURATION=10

diff --git a/src/YaSolR_EventHandlers.cpp b/src/YaSolR_EventHandlers.cpp
@@ -88,12 +88,10 @@ void YaSolR::YaSolRClass::_initEventHandlers() {
           Mycila::Config.set(KEY_WIFI_SSID, ESPConnect.getConfiguredWiFiSSID());
           Mycila::Config.set(KEY_WIFI_PASSWORD, ESPConnect.getConfiguredWiFiPassword());
         }
-        restartTask.resume();
         break;
       }
       case ESPConnectState::PORTAL_TIMEOUT:
         Mycila::Logger.warn(TAG, "Captive Portal: timed out.");
-        restartTask.resume();
         break;
       case ESPConnectState::NETWORK_TIMEOUT:
         Mycila::Logger.warn(TAG, "Unable to connect!");