From 1d677a9c61df9aee9fb516ce5396aa0baa59fcdc Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Sun, 24 Mar 2019 21:00:22 +0100 Subject: [PATCH] Small fix for Aidon list 3 --- .../AmsToMqttBridge/AmsToMqttBridge.ino | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Arduino Code/AmsToMqttBridge/AmsToMqttBridge.ino b/Arduino Code/AmsToMqttBridge/AmsToMqttBridge.ino index f0d9f0bd..60a7eef2 100644 --- a/Arduino Code/AmsToMqttBridge/AmsToMqttBridge.ino +++ b/Arduino Code/AmsToMqttBridge/AmsToMqttBridge.ino @@ -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);