diff --git a/src/mqtt/RawMqttHandler.cpp b/src/mqtt/RawMqttHandler.cpp index cffcd7a5..1f13d7f0 100644 --- a/src/mqtt/RawMqttHandler.cpp +++ b/src/mqtt/RawMqttHandler.cpp @@ -15,10 +15,10 @@ bool RawMqttHandler::publish(AmsData* data, AmsData* meterState) { mqtt->publish(topic + "/meter/id", data->getMeterId(), true, 0); mqtt->publish(topic + "/meter/type", data->getMeterModel(), true, 0); mqtt->publish(topic + "/meter/clock", String(data->getMeterTimestamp())); - mqtt->publish(topic + "/meter/import/reactive/accumulated", String(data->getReactiveImportCounter(), 2), true, 0); - mqtt->publish(topic + "/meter/import/active/accumulated", String(data->getActiveImportCounter(), 2), true, 0); - mqtt->publish(topic + "/meter/export/reactive/accumulated", String(data->getReactiveExportCounter(), 2), true, 0); - mqtt->publish(topic + "/meter/export/active/accumulated", String(data->getActiveExportCounter(), 2), true, 0); + mqtt->publish(topic + "/meter/import/reactive/accumulated", String(data->getReactiveImportCounter(), 3), true, 0); + mqtt->publish(topic + "/meter/import/active/accumulated", String(data->getActiveImportCounter(), 3), true, 0); + mqtt->publish(topic + "/meter/export/reactive/accumulated", String(data->getReactiveExportCounter(), 3), true, 0); + mqtt->publish(topic + "/meter/export/active/accumulated", String(data->getActiveExportCounter(), 3), true, 0); if(full || meterState->getPowerFactor() != data->getPowerFactor()) { mqtt->publish(topic + "/meter/powerfactor", String(data->getPowerFactor(), 2)); } diff --git a/src/web/AmsWebServer.cpp b/src/web/AmsWebServer.cpp index d14c9c9f..905dea31 100644 --- a/src/web/AmsWebServer.cpp +++ b/src/web/AmsWebServer.cpp @@ -747,7 +747,7 @@ void AmsWebServer::dataJson() { if(eapi != NULL && strlen(eapi->getToken()) > 0) price = eapi->getValueForHour(0); - char json[340]; + char json[384]; snprintf_P(json, sizeof(json), DATA_JSON, maxPwr == 0 ? meterState->isThreePhase() ? 20000 : 10000 : maxPwr, meterConfig->productionCapacity, diff --git a/web/data.json b/web/data.json index 6de2c486..5cb20cf1 100644 --- a/web/data.json +++ b/web/data.json @@ -6,10 +6,10 @@ "e" : %d, "ri" : %d, "re" : %d, - "ic" : %.2f, - "ec" : %.2f, - "ric" : %.2f, - "rec" : %.2f, + "ic" : %.3f, + "ec" : %.3f, + "ric" : %.3f, + "rec" : %.3f, "u1" : %.2f, "u2" : %.2f, "u3" : %.2f, diff --git a/web/json3.json b/web/json3.json index 6edc56fe..584503f0 100644 --- a/web/json3.json +++ b/web/json3.json @@ -20,10 +20,10 @@ "U1" : %.2f, "U2" : %.2f, "U3" : %.2f, - "tPI" : %.2f, - "tPO" : %.2f, - "tQI" : %.2f, - "tQO" : %.2f, + "tPI" : %.3f, + "tPO" : %.3f, + "tQI" : %.3f, + "tQO" : %.3f, "rtc" : %lu } }