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

Added option to substitute missing I2 for Aidon IT meters. Also cleaned up some more UI

Browse Source
This commit is contained in:
Gunnar Skjold
2020-05-04 16:07:23 +02:00
parent dc83853d2e
commit c3c0ca0a1b
15 changed files with 212 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/AmsData.cpp
View File

@@ -5,7 +5,7 @@
AmsData::AmsData() {}
AmsData::AmsData(int meterType, HanReader& hanReader) {
AmsData::AmsData(int meterType, bool substituteMissing, HanReader& hanReader) {
lastUpdateMillis = millis();
packageTimestamp = hanReader.getPackageTime();
@@ -15,7 +15,7 @@ AmsData::AmsData(int meterType, HanReader& hanReader) {
extractFromKaifa(hanReader, listSize);
break;
case METER_TYPE_AIDON:
extractFromAidon(hanReader, listSize);
extractFromAidon(hanReader, listSize, substituteMissing);
break;
case METER_TYPE_KAMSTRUP:
extractFromKamstrup(hanReader, listSize);
@@ -87,7 +87,7 @@ void AmsData::extractFromKaifa(HanReader& hanReader, int listSize) {
}
}
void AmsData::extractFromAidon(HanReader& hanReader, int listSize) {
void AmsData::extractFromAidon(HanReader& hanReader, int listSize, bool substituteMissing) {
switch(listSize) {
case (int)Aidon::List1:
listType = 1;
@@ -168,7 +168,9 @@ void AmsData::extractFromAidon(HanReader& hanReader, int listSize) {
l1voltage = ((double) hanReader.getInt( (int)Aidon_List3PhaseIT::VoltageL1)) / 10;
l2voltage = ((double) hanReader.getInt( (int)Aidon_List3PhaseIT::VoltageL2)) / 10;
l3voltage = ((double) hanReader.getInt( (int)Aidon_List3PhaseIT::VoltageL3)) / 10;
//l2current = ((activeImportPower * sqrt(3)) - (l1voltage * l1current) - (l3voltage * l3current)) / l2voltage;
if(substituteMissing) {
l2current = ((activeImportPower * sqrt(3)) - (l1voltage * l1current) - (l3voltage * l3current)) / l2voltage;
}
break;
}
}