github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-03-09 12:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Combined import/export in data.json

Browse Source
This commit is contained in:
Gunnar Skjold
2024-06-06 17:34:33 +02:00
parent da6328c246
commit f593e14e68
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/SvelteUi/json/data.json
View File

@@ -4,6 +4,7 @@
"mf" : %d,
"i" : %lu,
"e" : %lu,
"w" : %ld,
"ri" : %lu,
"re" : %lu,
"ic" : %.3f,

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

@@ -544,6 +544,7 @@ void AmsWebServer::dataJson() {
mainFuse == 0 ? 40 : mainFuse,
meterState->getActiveImportPower(),
meterState->getActiveExportPower(),
((int32_t) meterState->getActiveImportPower()) - meterState->getActiveExportPower(),
meterState->getReactiveImportPower(),
meterState->getReactiveExportPower(),
meterState->getActiveImportCounter(),