Merge remote-tracking branch 'upstream/main'

Author: ewowi

CHANGELOG.md

@@ -15,6 +15,10 @@ All notable changes to this project will be documented in this file.
 - Changed the width of the confirm dialog.
 - SvelteKit bundling as single files to reduce heap consumption.
 
+### Fixes
+
+- [#109](https://github.com/theelims/ESP32-sveltekit/issues/109)
+
 ## [0.6.0] - 2025-11-03
 
 > [!CAUTION]

lib/framework/EthernetSettingsService.cpp

@@ -14,6 +14,8 @@
 
 #include <EthernetSettingsService.h>
 
+#if FT_ENABLED(FT_ETHERNET)
+
 EthernetSettingsService::EthernetSettingsService(PsychicHttpServer *server,
                                                  FS *fs,
                                                  SecurityManager *securityManager,
@@ -113,4 +115,6 @@ void EthernetSettingsService::updateEthernet()
     doc["connected"] = ETH.connected();
     JsonObject jsonObject = doc.as<JsonObject>();
     _socket->emitEvent(EVENT_ETHERNET, jsonObject);
-}
+}
+
+#endif // end FT_ENABLED(FT_ETHERNET)

lib/framework/EthernetSettingsService.h

@@ -38,6 +38,8 @@
 
 #define EVENT_ETHERNET "ethernet"
 
+#if FT_ENABLED(FT_ETHERNET)
+
 // Struct defining the ethernet settings
 typedef struct
 {
@@ -136,4 +138,5 @@ class EthernetSettingsService : public StatefulService<EthernetSettings>
     void updateEthernet();
 };
 
+#endif // end FT_ENABLED(FT_ETHERNET)
 #endif // end EthernetSettingsService_h

lib/framework/EthernetStatus.cpp

@@ -14,6 +14,8 @@
 
 #include <EthernetStatus.h>
 
+#if FT_ENABLED(FT_ETHERNET)
+
 EthernetStatus::EthernetStatus(PsychicHttpServer *server,
                                SecurityManager *securityManager) : _server(server),
                                                                    _securityManager(securityManager)
@@ -91,3 +93,5 @@ bool EthernetStatus::isConnected()
 {
     return ETH.connected();
 }
+
+#endif // end FT_ENABLED(FT_ETHERNET)

lib/framework/EthernetStatus.h

@@ -25,6 +25,8 @@
 
 #define ETHERNET_STATUS_SERVICE_PATH "/rest/ethernetStatus"
 
+#if FT_ENABLED(FT_ETHERNET)
+
 class EthernetStatus
 {
 public:
@@ -46,4 +48,6 @@ class EthernetStatus
     esp_err_t ethernetStatus(PsychicRequest *request);
 };
 
+#endif // end FT_ENABLED(FT_ETHERNET)
+
 #endif // end EthernetStatus_h

lib/framework/WiFiSettingsService.cpp

@@ -311,9 +311,7 @@ void WiFiSettingsService::manageSTA()
     {
         return;
     }
-
-    // Connect or reconnect as required
-    if ((WiFi.getMode() & WIFI_STA) == 0) // 🌙 , see https://github.com/theelims/ESP32-sveltekit/issues/109 🚧
+    else
     {
 #ifdef SERIAL_INFO
         Serial.println("Connecting to WiFi...");
@@ -490,7 +488,7 @@ void WiFiSettingsService::updateRSSI()
 
 void WiFiSettingsService::onStationModeDisconnected(WiFiEvent_t event, WiFiEventInfo_t info)
 {
-    WiFi.disconnect(true);
+    manageSTA();
 }
 
 void WiFiSettingsService::onStationModeStop(WiFiEvent_t event, WiFiEventInfo_t info)