github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-02-17 13:18:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Increased range for instant values

Browse Source
This commit is contained in:
Gunnar Skjold
2023-02-14 20:23:23 +01:00
parent 4d6e63a171
commit 1f5a04e606
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/AmsData/include/AmsData.h
View File

@@ -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;

8
lib/AmsData/src/AmsData.cpp
View File

@@ -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;
}

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

@@ -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,