github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-04-26 12:17:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed real time calculation issues

Browse Source
This commit is contained in:
Gunnar Skjold
2021-12-19 09:14:31 +01:00
parent f3dba112de
commit 2a20893a58
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/AmsData.cpp
View File

@@ -7,22 +7,29 @@ void AmsData::apply(AmsData& other) {
unsigned long ms = this->lastUpdateMillis > other.getLastUpdateMillis() ? 0 : other.getLastUpdateMillis() - this->lastUpdateMillis; unsigned long ms = this->lastUpdateMillis > other.getLastUpdateMillis() ? 0 : other.getLastUpdateMillis() - this->lastUpdateMillis;
if(ms > 0) { if(ms > 0) {
if(other.getActiveImportPower() > 0) if(other.getActiveImportPower() > 0) {
activeImportCounter += (((float) ms) * other.getActiveImportPower()) / 3600000000.0; float add = other.getActiveImportPower() * (((float) ms) / 3600000.0);
activeImportCounter += add / 1000.0;
//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->lastUpdateMillis > other.getLastUpdateMillis() ? 0 : other.getLastUpdateMillis() - this->lastList2;
if(other.getActiveExportPower() > 0) if(other.getActiveExportPower() > 0) {
activeExportCounter += (((float) ms) * other.getActiveExportPower()) / 3600000000.0; float add = other.getActiveExportPower() * (((float) ms) / 3600000.0);
if(other.getReactiveImportPower() > 0) activeExportCounter += add / 1000.0;
reactiveImportCounter += (((float) ms) * other.getReactiveImportPower()) / 3600000000.0; }
if(other.getReactiveExportPower() > 0) if(other.getReactiveImportPower() > 0) {
reactiveExportCounter += (((float) ms) * other.getReactiveExportPower()) / 3600000000.0; float add = other.getReactiveImportPower() * (((float) ms) / 3600000.0);
reactiveImportCounter += add / 1000.0;
}
if(other.getReactiveExportPower() > 0) {
float add = other.getReactiveExportPower() * (((float) ms) / 3600000.0);
reactiveExportCounter += add / 1000.0;
}
} }
counterEstimated = true; counterEstimated = true;
} }
} else {
//Serial.printf("\nDeviation: %.4f\n", other.getActiveImportCounter() - activeImportCounter);
} }
this->lastUpdateMillis = other.getLastUpdateMillis(); this->lastUpdateMillis = other.getLastUpdateMillis();