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

Fixing some bug reports

Browse Source
This commit is contained in:
Gunnar Skjold
2023-01-30 16:07:08 +01:00
parent be71cbe609
commit bc42099962
11 changed files with 151 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/SvelteUi/src/AmsWebServer.cpp
View File

@@ -407,7 +407,7 @@ void AmsWebServer::dataJson() {
snprintf_P(buf, BufferSize, DATA_JSON,
maxPwr == 0 ? meterState->isThreePhase() ? 20000 : 10000 : maxPwr,
meterConfig->productionCapacity,
meterConfig->mainFuse == 0 ? 32 : meterConfig->mainFuse,
meterConfig->mainFuse == 0 ? 40 : meterConfig->mainFuse,
meterState->getActiveImportPower(),
meterState->getActiveExportPower(),
meterState->getReactiveImportPower(),
@@ -454,7 +454,7 @@ void AmsWebServer::dataJson() {
ea->getCostThisMonth(),
ea->getProducedThisMonth(),
ea->getIncomeThisMonth(),
priceRegion.c_str(),
eapi == NULL ? "" : priceRegion.c_str(),
meterState->getLastError(),
eapi == NULL ? 0 : eapi->getLastError(),
(uint32_t) now,