diff --git a/lib/AmsData/include/AmsData.h b/lib/AmsData/include/AmsData.h index 5a3f7b98..61d07805 100644 --- a/lib/AmsData/include/AmsData.h +++ b/lib/AmsData/include/AmsData.h @@ -35,10 +35,10 @@ public: time_t getMeterTimestamp(); - uint16_t getActiveImportPower(); - uint16_t getReactiveImportPower(); - uint16_t getActiveExportPower(); - uint16_t getReactiveExportPower(); + uint32_t getActiveImportPower(); + uint32_t getReactiveImportPower(); + uint32_t getActiveExportPower(); + uint32_t getReactiveExportPower(); float getL1Voltage(); float getL2Voltage(); @@ -79,7 +79,7 @@ protected: time_t packageTimestamp = 0; String listId = "", meterId = "", meterModel = ""; time_t meterTimestamp = 0; - uint16_t activeImportPower = 0, reactiveImportPower = 0, activeExportPower = 0, reactiveExportPower = 0; + uint32_t activeImportPower = 0, reactiveImportPower = 0, activeExportPower = 0, reactiveExportPower = 0; float l1voltage = 0, l2voltage = 0, l3voltage = 0, l1current = 0, l2current = 0, l3current = 0; float l1activeImportPower = 0, l2activeImportPower = 0, l3activeImportPower = 0; float l1activeExportPower = 0, l2activeExportPower = 0, l3activeExportPower = 0; diff --git a/lib/AmsData/src/AmsData.cpp b/lib/AmsData/src/AmsData.cpp index 8e892cca..92cd6a30 100644 --- a/lib/AmsData/src/AmsData.cpp +++ b/lib/AmsData/src/AmsData.cpp @@ -114,19 +114,19 @@ time_t AmsData::getMeterTimestamp() { return this->meterTimestamp; } -uint16_t AmsData::getActiveImportPower() { +uint32_t AmsData::getActiveImportPower() { return this->activeImportPower; } -uint16_t AmsData::getReactiveImportPower() { +uint32_t AmsData::getReactiveImportPower() { return this->reactiveImportPower; } -uint16_t AmsData::getActiveExportPower() { +uint32_t AmsData::getActiveExportPower() { return this->activeExportPower; } -uint16_t AmsData::getReactiveExportPower() { +uint32_t AmsData::getReactiveExportPower() { return this->reactiveExportPower; } diff --git a/lib/SvelteUi/json/data.json b/lib/SvelteUi/json/data.json index 00d89d87..70e26461 100644 --- a/lib/SvelteUi/json/data.json +++ b/lib/SvelteUi/json/data.json @@ -2,10 +2,10 @@ "im" : %d, "om" : %d, "mf" : %d, - "i" : %d, - "e" : %d, - "ri" : %d, - "re" : %d, + "i" : %lu, + "e" : %lu, + "ri" : %lu, + "re" : %lu, "ic" : %.3f, "ec" : %.3f, "ric" : %.3f,