github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-25 20:06:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev-v2.3

Browse Source
This commit is contained in:
Gunnar Skjold
2023-12-25 07:41:01 +01:00
parent c43c07386a b1294fdd86
commit 50de5abf93
36 changed files with 500 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,7 +77,7 @@ public:
bool isThreePhase();
bool isTwoPhase();
bool isCounterEstimated();
bool isL2currentEstimated();
bool isL2currentMissing();
int8_t getLastError();
void setLastError(int8_t);
@@ -95,7 +95,7 @@ protected:
float l1activeExportPower = 0, l2activeExportPower = 0, l3activeExportPower = 0;
float powerFactor = 0, l1PowerFactor = 0, l2PowerFactor = 0, l3PowerFactor = 0;
double activeImportCounter = 0, reactiveImportCounter = 0, activeExportCounter = 0, reactiveExportCounter = 0;
bool threePhase = false, twoPhase = false, counterEstimated = false, l2currentEstimated = false;
bool threePhase = false, twoPhase = false, counterEstimated = false, l2currentMissing = false;;
int8_t lastError = 0x00;
uint8_t lastErrorCount = 0;

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

@@ -73,7 +73,7 @@ void AmsData::apply(AmsData& other) {
this->reactiveExportPower = other.getReactiveExportPower();
this->l1current = other.getL1Current();
this->l2current = other.getL2Current();
this->l2currentEstimated = other.isL2currentEstimated();
this->l2currentMissing = other.isL2currentMissing();
this->l3current = other.getL3Current();
this->l1voltage = other.getL1Voltage();
this->l2voltage = other.getL2Voltage();
@@ -314,8 +314,8 @@ bool AmsData::isCounterEstimated() {
return this->counterEstimated;
}
bool AmsData::isL2currentEstimated() {
return this->l2currentEstimated;
bool AmsData::isL2currentMissing() {
return this->l2currentMissing;
}
int8_t AmsData::getLastError() {