github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-27 04:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev-v2.1.0

Browse Source
This commit is contained in:
Gunnar Skjold
2022-01-23 20:22:01 +01:00
parent a72f02a779 6aa02d54c8
commit e8a56d5fc7
8 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/web/AmsWebServer.cpp
View File

@@ -791,7 +791,6 @@ void AmsWebServer::dataJson() {
mqttStatus,
mqtt == NULL ? 0 : (int) mqtt->lastError(),
price == ENTSOE_NO_VALUE ? "null" : String(price, 2).c_str(),
time(nullptr),
meterState->getMeterType(),
meterConfig->distributionSystem,
ea->getMonthMax(),
@@ -801,7 +800,8 @@ void AmsWebServer::dataJson() {
ea->getUseToday(),
ea->getCostToday(),
ea->getUseThisMonth(),
ea->getCostThisMonth()
ea->getCostThisMonth(),
(uint32_t) time(nullptr)
);
server.sendHeader("Cache-Control", "no-cache, no-store, must-revalidate");
@@ -1048,7 +1048,6 @@ void AmsWebServer::handleSetup() {
break;
case 200: // ESP32
gpioConfig->hanPin = 16;
gpioConfig->apPin = 4;
gpioConfig->ledPin = 2;
gpioConfig->ledInverted = false;
break;
@@ -1287,7 +1286,6 @@ void AmsWebServer::handleSave() {
strcpy(entsoe.currency, server.arg("ecu").c_str());
entsoe.multiplier = server.arg("em").toFloat() * 1000;
config->setEntsoeConfig(entsoe);
eapi->setup(entsoe);
}
printI("Saving configuration now...");