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

Merge branch 'master' into dev-v2.2

Browse Source
This commit is contained in:
Gunnar Skjold
2022-12-07 20:11:14 +01:00
parent 2218ac4e8a 6b0d540f39
commit 0145be851e
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/IEC6205675.cpp
View File

@@ -98,8 +98,10 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, MeterConfig* meterCo
}
if(listType >= 2 && memcmp(meterModel.c_str(), "MA304T3", 7) == 0) {
l2current = (((activeImportPower - activeExportPower) * sqrt(3)) - (l1voltage * l1current) - (l3voltage * l3current)) / l2voltage;
l2voltage = sqrt(pow(l1voltage - l3voltage * cos(60 * (PI/180)), 2) + pow(l3voltage * sin(60 * (PI/180)),2));
if(l2voltage > 0) {
l2current = (((activeImportPower - activeExportPower) * sqrt(3)) - (l1voltage * l1current) - (l3voltage * l3current)) / l2voltage;
}
}
if(listType == 3) {