diff --git a/src/CHANGES.md b/src/CHANGES.md index 8fb3e579..0e90a4f5 100644 --- a/src/CHANGES.md +++ b/src/CHANGES.md @@ -3,6 +3,7 @@ ## 0.8.118 - 2024-05-10 * possible fix reset max values #1609 * slightly improved WiFi reconnect +* update AsyncWebserver to `3.2.0` ## 0.8.117 - 2024-05-09 * fix reboot issue #1607 #1606 diff --git a/src/platformio.ini b/src/platformio.ini index 49eff335..efcc6e5f 100644 --- a/src/platformio.ini +++ b/src/platformio.ini @@ -25,7 +25,7 @@ extra_scripts = pre:../scripts/reduceGxEPD2.py lib_deps = - https://github.com/esphome/ESPAsyncWebServer @ ^3.1.0 + https://github.com/esphome/ESPAsyncWebServer @ ^3.2.0 https://github.com/nRF24/RF24.git#v1.4.8 paulstoffregen/Time @ ^1.6.1 https://github.com/bertmelis/espMqttClient#v1.6.0 diff --git a/src/web/RestApi.h b/src/web/RestApi.h index dcfd8044..f3477c92 100644 --- a/src/web/RestApi.h +++ b/src/web/RestApi.h @@ -572,13 +572,13 @@ class RestApi { } obj[F("interval")] = String(mConfig->inst.sendInterval); obj[F("max_num_inverters")] = MAX_NUM_INVERTERS; - obj[F("rstMid")] = (bool)mConfig->inst.rstYieldMidNight; + obj[F("rstMid")] = (bool)mConfig->inst.rstValsAtMidNight; obj[F("rstNotAvail")] = (bool)mConfig->inst.rstValsNotAvail; obj[F("rstComStop")] = (bool)mConfig->inst.rstValsCommStop; obj[F("rstComStart")] = (bool)mConfig->inst.rstValsCommStart; obj[F("strtWthtTm")] = (bool)mConfig->inst.startWithoutTime; obj[F("rdGrid")] = (bool)mConfig->inst.readGrid; - obj[F("rstMaxMid")] = (bool)mConfig->inst.rstMaxValsMidNight; + obj[F("rstMaxMid")] = (bool)mConfig->inst.rstIncludeMaxVals; } void getInverter(JsonObject obj, uint8_t id) { diff --git a/src/web/web.h b/src/web/web.h index 5d75199b..9c8750fc 100644 --- a/src/web/web.h +++ b/src/web/web.h @@ -498,13 +498,13 @@ class Web { if (request->arg("invInterval") != "") mConfig->inst.sendInterval = request->arg("invInterval").toInt(); - mConfig->inst.rstYieldMidNight = (request->arg("invRstMid") == "on"); + mConfig->inst.rstValsAtMidNight = (request->arg("invRstMid") == "on"); mConfig->inst.rstValsCommStop = (request->arg("invRstComStop") == "on"); mConfig->inst.rstValsCommStart = (request->arg("invRstComStart") == "on"); mConfig->inst.rstValsNotAvail = (request->arg("invRstNotAvail") == "on"); mConfig->inst.startWithoutTime = (request->arg("strtWthtTm") == "on"); mConfig->inst.readGrid = (request->arg("rdGrid") == "on"); - mConfig->inst.rstMaxValsMidNight = (request->arg("invRstMaxMid") == "on"); + mConfig->inst.rstIncludeMaxVals = (request->arg("invRstMaxMid") == "on"); // pinout