From 04c269d982d5b91b7310bc03480d8a133ed0b7da Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Sat, 19 Feb 2022 09:07:35 +0100 Subject: [PATCH] Double precision on accumulated values --- src/AmsData.cpp | 8 ++++---- src/AmsData.h | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/AmsData.cpp b/src/AmsData.cpp index 5620f018..140e79e5 100644 --- a/src/AmsData.cpp +++ b/src/AmsData.cpp @@ -160,19 +160,19 @@ float AmsData::getL3PowerFactor() { return this->l3PowerFactor; } -float AmsData::getActiveImportCounter() { +double AmsData::getActiveImportCounter() { return this->activeImportCounter; } -float AmsData::getReactiveImportCounter() { +double AmsData::getReactiveImportCounter() { return this->reactiveImportCounter; } -float AmsData::getActiveExportCounter() { +double AmsData::getActiveExportCounter() { return this->activeExportCounter; } -float AmsData::getReactiveExportCounter() { +double AmsData::getReactiveExportCounter() { return this->reactiveExportCounter; } diff --git a/src/AmsData.h b/src/AmsData.h index 0f8c87df..3ffcd296 100644 --- a/src/AmsData.h +++ b/src/AmsData.h @@ -53,10 +53,10 @@ public: float getL2PowerFactor(); float getL3PowerFactor(); - float getActiveImportCounter(); - float getReactiveImportCounter(); - float getActiveExportCounter(); - float getReactiveExportCounter(); + double getActiveImportCounter(); + double getReactiveImportCounter(); + double getActiveExportCounter(); + double getReactiveExportCounter(); bool isThreePhase(); bool isTwoPhase(); @@ -71,7 +71,7 @@ protected: uint16_t activeImportPower = 0, reactiveImportPower = 0, activeExportPower = 0, reactiveExportPower = 0; float l1voltage = 0, l2voltage = 0, l3voltage = 0, l1current = 0, l2current = 0, l3current = 0; float powerFactor = 0, l1PowerFactor = 0, l2PowerFactor = 0, l3PowerFactor = 0; - float activeImportCounter = 0, reactiveImportCounter = 0, activeExportCounter = 0, reactiveExportCounter = 0; + double activeImportCounter = 0, reactiveImportCounter = 0, activeExportCounter = 0, reactiveExportCounter = 0; bool threePhase = false, twoPhase = false, counterEstimated = false; };