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

Small fix for Aidon list 3

Browse Source
This commit is contained in:
Gunnar Skjold 2019-03-24 21:00:22 +01:00
parent af6e1617fc
commit 1d677a9c61
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Arduino Code/AmsToMqttBridge/AmsToMqttBridge.ino
View File

@ -237,17 +237,17 @@ void readHanPort_Aidon(int listSize)
}
else if (listSize == (int)Aidon::List3)
{
data["lv"] = hanReader.getString((int)Aidon_List3::ListVersionIdentifier);;
data["id"] = hanReader.getString((int)Aidon_List3::MeterID);
data["type"] = hanReader.getString((int)Aidon_List3::MeterType);
data["P"] = hanReader.getInt((int)Aidon_List3::ActiveImportPower);
data["Q"] = hanReader.getInt((int)Aidon_List3::ReactiveImportPower);
data["I1"] = hanReader.getInt((int)Aidon_List3::CurrentL1);
data["I2"] = hanReader.getInt((int)Aidon_List3::CurrentL2);
data["I3"] = hanReader.getInt((int)Aidon_List3::CurrentL3);
data["U1"] = ((double) hanReader.getInt((int)Aidon_List3::VoltageL1)) / 10;
data["U2"] = ((double) hanReader.getInt((int)Aidon_List3::VoltageL2)) / 10;
data["U3"] = ((double) hanReader.getInt((int)Aidon_List3::VoltageL3)) / 10;
data["lv"] = hanReader.getString((int)Aidon_List2::ListVersionIdentifier);
data["id"] = hanReader.getString((int)Aidon_List2::MeterID);
data["type"] = hanReader.getString((int)Aidon_List2::MeterType);
data["P"] = hanReader.getInt((int)Aidon_List2::ActiveImportPower);
data["Q"] = hanReader.getInt((int)Aidon_List2::ReactiveExportPower);
data["I1"] = ((double) hanReader.getInt((int)Aidon_List2::CurrentL1)) / 10;
data["I2"] = ((double) hanReader.getInt((int)Aidon_List2::CurrentL2)) / 10;
data["I3"] = ((double) hanReader.getInt((int)Aidon_List2::CurrentL3)) / 10;
data["U1"] = ((double) hanReader.getInt((int)Aidon_List2::VoltageL1)) / 10;
data["U2"] = ((double) hanReader.getInt((int)Aidon_List2::VoltageL2)) / 10;
data["U3"] = ((double) hanReader.getInt((int)Aidon_List2::VoltageL3)) / 10;
data["tPI"] = hanReader.getInt((int)Aidon_List3::CumulativeActiveImportEnergy);
data["tPO"] = hanReader.getInt((int)Aidon_List3::CumulativeActiveExportEnergy);
data["tQI"] = hanReader.getInt((int)Aidon_List3::CumulativeReactiveImportEnergy);