3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-06-06 20:51:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

0.8.58

Browse source 
* fix missing refresh URL #1366
* fix view of grid profile #1365
* fix webUI translation #1346
* fix protection mask #1352
This commit is contained in:
lumapu 2024-01-17 22:08:17 +01:00
parent f503516c9f
commit 8c9be73091
6 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/CHANGES.md
View file

@ -1,5 +1,11 @@
# Development Changes # Development Changes
## 0.8.58 - 2024-01-17
* fix missing refresh URL #1366
* fix view of grid profile #1365
* fix webUI translation #1346
* fix protection mask #1352
## 0.8.57 - 2024-01-15 ## 0.8.57 - 2024-01-15
* merge PR: fix immediate clearing of display after sunset #1364 * merge PR: fix immediate clearing of display after sunset #1364
* merge PR: MI-MQTT and last retransmit #1363 * merge PR: MI-MQTT and last retransmit #1363

1
src/app.cpp
View file

@ -19,6 +19,7 @@ void app::setup() {
yield(); yield();
resetSystem(); resetSystem();
esp_task_wdt_reset();
mSettings.setup(); mSettings.setup();
mSettings.getPtr(mConfig); mSettings.getPtr(mConfig);

1
src/web/RestApi.h
View file

@ -354,6 +354,7 @@ 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();
obj[F("refresh_url")] = "/";
#if defined(ETHERNET) && defined(CONFIG_IDF_TARGET_ESP32S3) #if defined(ETHERNET) && defined(CONFIG_IDF_TARGET_ESP32S3)
obj[F("reload")] = 5; obj[F("reload")] = 5;
#else #else

4
src/web/html/grid_info.json
View file

@ -717,7 +717,7 @@
}, },
{ {
"name": "Recovery High Frequency", "name": "Recovery High Frequency",
"div": 10, "div": 100,
"min": 50.1, "min": 50.1,
"max": 52, "max": 52,
"def": 50.2, "def": 50.2,
@ -967,7 +967,7 @@
"unit": "%Pn" "unit": "%Pn"
}, },
{ {
"name": "Power Factor ar Rated Power", "name": "Power Factor of Rated Power",
"div": 100, "div": 100,
"min": 0.8, "min": 0.8,
"max": 1, "max": 1,

2
src/web/lang.json
View file

@ -1191,7 +1191,7 @@
{ {
"token": "LAST_RECEIVED", "token": "LAST_RECEIVED",
"en": "Last received data requested at", "en": "Last received data requested at",
"de": "Zuletzt empfangene Daten wurden angefragt um" "de": "Zuletzt empfangene Daten wurden angefragt am"
}, },
{ {
"token": "NOTHING_RECEIVED", "token": "NOTHING_RECEIVED",

2
src/web/web.h
View file

@ -488,7 +488,7 @@ class Web {
mProtected = (strlen(mConfig->sys.adminPwd) > 0); mProtected = (strlen(mConfig->sys.adminPwd) > 0);
} }
mConfig->sys.protectionMask = 0x0000; mConfig->sys.protectionMask = 0x0000;
for (uint8_t i = 0; i < 6; i++) { for (uint8_t i = 0; i < 7; i++) {
if (request->arg("protMask" + String(i)) == "on") if (request->arg("protMask" + String(i)) == "on")
mConfig->sys.protectionMask |= (1 << i); mConfig->sys.protectionMask |= (1 << i);
} }