From f593e14e68e60c138a141c47b3168bbe7c064a85 Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Thu, 6 Jun 2024 17:34:33 +0200 Subject: [PATCH] Combined import/export in data.json --- lib/SvelteUi/json/data.json | 1 + lib/SvelteUi/src/AmsWebServer.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/SvelteUi/json/data.json b/lib/SvelteUi/json/data.json index 0d8c4e20..08b0f0d7 100644 --- a/lib/SvelteUi/json/data.json +++ b/lib/SvelteUi/json/data.json @@ -4,6 +4,7 @@ "mf" : %d, "i" : %lu, "e" : %lu, + "w" : %ld, "ri" : %lu, "re" : %lu, "ic" : %.3f, diff --git a/lib/SvelteUi/src/AmsWebServer.cpp b/lib/SvelteUi/src/AmsWebServer.cpp index b4f43a67..2480507f 100644 --- a/lib/SvelteUi/src/AmsWebServer.cpp +++ b/lib/SvelteUi/src/AmsWebServer.cpp @@ -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(),