0.8.139

* fix reload after save for WiFi configurations (5s -> 20s)
lumapu · Aug 15, 2024 · fe5dacd · fe5dacd
1 parent 01285f0
commit fe5dacd
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/src/CHANGES.md b/src/CHANGES.md
@@ -1,5 +1,8 @@
 # Development Changes
 
+## 0.8.139 - 2024-08-15
+* fix reload after save for WiFi configurations (5s -> 20s)
+
 ## 0.8.138 - 2024-08-15
 * fix ePaper not functional #1722
 

diff --git a/src/defines.h b/src/defines.h
@@ -13,7 +13,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       8
-#define VERSION_PATCH       138
+#define VERSION_PATCH       139
 //-------------------------------------
 typedef struct {
     uint8_t ch;

diff --git a/src/web/RestApi.h b/src/web/RestApi.h
@@ -457,8 +457,8 @@ class RestApi {
 
         void getHtmlReboot(AsyncWebServerRequest *request, JsonObject obj) {
             getGeneric(request, obj.createNestedObject(F("generic")));
-            #if defined(ETHERNET) && defined(CONFIG_IDF_TARGET_ESP32S3)
-            obj[F("refresh")] = 5;
+            #if defined(ETHERNET)
+            obj[F("refresh")] = (mConfig->sys.eth.enabled) ? 5 : 20;
             #else
             obj[F("refresh")] = 20;
             #endif
@@ -471,8 +471,8 @@ class RestApi {
             obj[F("pending")] = (bool)mApp->getSavePending();
             obj[F("success")] = (bool)mApp->getLastSaveSucceed();
             obj[F("reboot")] = (bool)mApp->getShouldReboot();
-            #if defined(ETHERNET) && defined(CONFIG_IDF_TARGET_ESP32S3)
-            obj[F("reload")] = 5;
+            #if defined(ETHERNET)
+            obj[F("reload")] = (mConfig->sys.eth.enabled) ? 5 : 20;
             #else
             obj[F("reload")] = 20;
             #endif
@@ -489,7 +489,7 @@ class RestApi {
             mApp->setRebootFlag();
             obj[F("html")] = F("Erase settings: success");
             #if defined(ETHERNET) && defined(CONFIG_IDF_TARGET_ESP32S3)
-            obj[F("reload")] = 5;
+            obj[F("reload")] = (mConfig->sys.eth.enabled) ? 5 : 20;
             #else
             obj[F("reload")] = 20;
             #endif
@@ -507,8 +507,8 @@ class RestApi {
             mApp->eraseSettings(true);
             mApp->setRebootFlag();
             obj[F("html")] = F("Factory reset: success");
-            #if defined(ETHERNET) && defined(CONFIG_IDF_TARGET_ESP32S3)
-            obj[F("reload")] = 5;
+            #if defined(ETHERNET)
+            obj[F("reload")] = (mConfig->sys.eth.enabled) ? 5 : 20;
             #else
             obj[F("reload")] = 20;
             #endif

diff --git a/src/web/web.h b/src/web/web.h
@@ -268,8 +268,8 @@ class Web {
             bool reboot = (!Update.hasError());
 
             String html = F("<!doctype html><html><head><title>Update</title><meta http-equiv=\"refresh\" content=\"");
-            #if defined(ETHERNET) && defined(CONFIG_IDF_TARGET_ESP32S3)
-                html += F("5");
+            #if defined(ETHERNET)
+                html += (mConfig->sys.eth.enabled) ? F("5") : F("20");
             #else
                 html += F("20");
             #endif