github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-04-24 19:40:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed calculation behaviour

Browse Source
This commit is contained in:
Gunnar Skjold
2024-03-21 13:49:16 +01:00
parent 26a63e30e0
commit def9867990
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,23 +14,27 @@ void AmsData::apply(AmsData& other) {
if(ms > 0) { if(ms > 0) {
if(other.getActiveImportPower() > 0) { if(other.getActiveImportPower() > 0) {
float add = other.getActiveImportPower() * (((float) ms) / 3600000.0); uint32_t power = (activeImportPower + other.getActiveImportPower()) / 2;
float add = power * (((float) ms) / 3600000.0);
activeImportCounter += add / 1000.0; activeImportCounter += add / 1000.0;
//Serial.printf("%dW, %dms, %.6fkWh added\n", other.getActiveImportPower(), ms, add); //Serial.printf("%dW, %dms, %.6fkWh added\n", other.getActiveImportPower(), ms, add);
} }
if(other.getListType() > 1) { if(other.getListType() > 1) {
ms = this->lastUpdateMillis > other.getLastUpdateMillis() ? 0 : other.getLastUpdateMillis() - this->lastList2; ms = this->lastList2 > other.getLastUpdateMillis() ? 0 : other.getLastUpdateMillis() - this->lastList2;
if(other.getActiveExportPower() > 0) { if(other.getActiveExportPower() > 0) {
float add = other.getActiveExportPower() * (((float) ms) / 3600000.0); uint32_t power = (activeExportPower + other.getActiveExportPower()) / 2;
float add = power * (((float) ms) / 3600000.0);
activeExportCounter += add / 1000.0; activeExportCounter += add / 1000.0;
} }
if(other.getReactiveImportPower() > 0) { if(other.getReactiveImportPower() > 0) {
float add = other.getReactiveImportPower() * (((float) ms) / 3600000.0); uint32_t power = (reactiveImportPower + other.getReactiveImportPower()) / 2;
float add = power * (((float) ms) / 3600000.0);
reactiveImportCounter += add / 1000.0; reactiveImportCounter += add / 1000.0;
} }
if(other.getReactiveExportPower() > 0) { if(other.getReactiveExportPower() > 0) {
float add = other.getReactiveExportPower() * (((float) ms) / 3600000.0); uint32_t power = (reactiveExportPower + other.getReactiveExportPower()) / 2;
float add = power * (((float) ms) / 3600000.0);
reactiveExportCounter += add / 1000.0; reactiveExportCounter += add / 1000.0;
} }
} }