github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-30 21:51:52 +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-10 09:49:22 +01:00
parent 111bd70763 ed899440ed
commit ee462ec468
21 changed files with 146 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,6 +73,7 @@ void AmsData::apply(AmsData& other) {
this->reactiveExportPower = other.getReactiveExportPower();
this->l1current = other.getL1Current();
this->l2current = other.getL2Current();
this->l2currentEstimated = other.isL2currentEstimated();
this->l3current = other.getL3Current();
this->l1voltage = other.getL1Voltage();
this->l2voltage = other.getL2Voltage();
@@ -313,6 +314,10 @@ bool AmsData::isCounterEstimated() {
return this->counterEstimated;
}
bool AmsData::isL2currentEstimated() {
return this->l2currentEstimated;
}
int8_t AmsData::getLastError() {
return lastErrorCount > 2 ? lastError : 0;
}