topaLE
/
ahoy
mirror of https://github.com/lumapu/ahoy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

0.8.139 

* fix reload after save for WiFi configurations (5s -> 20s)
pull/1758/head
lumapu 1 year ago
parent
01285f0cb7
commit
fe5dacd144
4 changed files with 13 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/CHANGES.md
  2. 2
      src/defines.h
  3. 14
      src/web/RestApi.h
  4. 4
      src/web/web.h

3
src/CHANGES.md
View File

@ -1,5 +1,8 @@
# Development Changes # Development Changes
## 0.8.139 - 2024-08-15
* fix reload after save for WiFi configurations (5s -> 20s)
## 0.8.138 - 2024-08-15 ## 0.8.138 - 2024-08-15
* fix ePaper not functional #1722 * fix ePaper not functional #1722

2
src/defines.h
View File

@ -13,7 +13,7 @@
//------------------------------------- //-------------------------------------
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 8 #define VERSION_MINOR 8
#define VERSION_PATCH 138 #define VERSION_PATCH 139
//------------------------------------- //-------------------------------------
typedef struct { typedef struct {
uint8_t ch; uint8_t ch;

14
src/web/RestApi.h
View File

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

4
src/web/web.h
View File

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

Write Preview
Loading…
Cancel
Save