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

Merge branch 'master' into dev-v2.1.0

Browse Source
This commit is contained in:
Gunnar Skjold
2022-02-19 09:08:02 +01:00
parent f8a86058a1 04c269d982
commit b41dd862b6
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/AmsData.cpp
View File

@@ -160,19 +160,19 @@ float AmsData::getL3PowerFactor() {
return this->l3PowerFactor; return this->l3PowerFactor;
} }
float AmsData::getActiveImportCounter() { double AmsData::getActiveImportCounter() {
return this->activeImportCounter; return this->activeImportCounter;
} }
float AmsData::getReactiveImportCounter() { double AmsData::getReactiveImportCounter() {
return this->reactiveImportCounter; return this->reactiveImportCounter;
} }
float AmsData::getActiveExportCounter() { double AmsData::getActiveExportCounter() {
return this->activeExportCounter; return this->activeExportCounter;
} }
float AmsData::getReactiveExportCounter() { double AmsData::getReactiveExportCounter() {
return this->reactiveExportCounter; return this->reactiveExportCounter;
} }

10
src/AmsData.h
View File

@@ -53,10 +53,10 @@ public:
float getL2PowerFactor(); float getL2PowerFactor();
float getL3PowerFactor(); float getL3PowerFactor();
float getActiveImportCounter(); double getActiveImportCounter();
float getReactiveImportCounter(); double getReactiveImportCounter();
float getActiveExportCounter(); double getActiveExportCounter();
float getReactiveExportCounter(); double getReactiveExportCounter();
bool isThreePhase(); bool isThreePhase();
bool isTwoPhase(); bool isTwoPhase();
@@ -71,7 +71,7 @@ protected:
uint16_t activeImportPower = 0, reactiveImportPower = 0, activeExportPower = 0, reactiveExportPower = 0; uint16_t activeImportPower = 0, reactiveImportPower = 0, activeExportPower = 0, reactiveExportPower = 0;
float l1voltage = 0, l2voltage = 0, l3voltage = 0, l1current = 0, l2current = 0, l3current = 0; float l1voltage = 0, l2voltage = 0, l3voltage = 0, l1current = 0, l2current = 0, l3current = 0;
float powerFactor = 0, l1PowerFactor = 0, l2PowerFactor = 0, l3PowerFactor = 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; bool threePhase = false, twoPhase = false, counterEstimated = false;
}; };