github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-02-01 22:51:58 +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

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

@@ -77,6 +77,7 @@ public:
bool isThreePhase();
bool isTwoPhase();
bool isCounterEstimated();
bool isL2currentEstimated();
int8_t getLastError();
void setLastError(int8_t);
@@ -94,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;
bool threePhase = false, twoPhase = false, counterEstimated = false, l2currentEstimated = false;
int8_t lastError = 0x00;
uint8_t lastErrorCount = 0;