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

Fixed compile errors

Browse Source
This commit is contained in:
Gunnar Skjold 2019-07-21 14:11:53 +02:00
parent 10f609b727
commit 818be07a08
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -3,6 +3,6 @@
[Rr]elease/
**/__vm/
.DS_Store
.vcode
.vscode
.pio
platformio.ini

18
Arduino Code/AmsToMqttBridge/AmsToMqttBridge.ino
View File

@ -184,7 +184,7 @@ void readHanPort()
void readHanPort_Aidon(int listSize)
{
if (listSize == (int)Aidon::List1 || listSize == (int)Aidon::List2 || listSize == (int)Aidon::List3 || listSize == (int)Aidon::List2_p1 ||)
if (listSize == (int)Aidon::List1 || listSize == (int)Aidon::List2 || listSize == (int)Aidon::List3 || listSize == (int)Aidon::List2_1p)
{
if (listSize == (int)Aidon::List2)
{
@ -235,15 +235,15 @@ void readHanPort_Aidon(int listSize)
data["U2"] = ((double) hanReader.getInt((int)Aidon_List2::VoltageL2)) / 10;
data["U3"] = ((double) hanReader.getInt((int)Aidon_List2::VoltageL3)) / 10;
}
else if (listSize == (int)Aidon::List2_p1)
else if (listSize == (int)Aidon::List2_1p)
{
data["lv"] = hanReader.getString((int)Aidon_List2_p1::ListVersionIdentifier);
data["id"] = hanReader.getString((int)Aidon_List2_p1::MeterID);
data["type"] = hanReader.getString((int)Aidon_List2_p1::MeterType);
data["P"] = hanReader.getInt((int)Aidon_List2_p1::ActiveImportPower);
data["Q"] = hanReader.getInt((int)Aidon_List2_p1::ReactiveExportPower);
data["I1"] = ((double) hanReader.getInt((int)Aidon_List2_p1::Current)) / 10;
data["U1"] = ((double) hanReader.getInt((int)Aidon_List2_p1::Voltage)) / 10;
data["lv"] = hanReader.getString((int)Aidon_List2_1p::ListVersionIdentifier);
data["id"] = hanReader.getString((int)Aidon_List2_1p::MeterID);
data["type"] = hanReader.getString((int)Aidon_List2_1p::MeterType);
data["P"] = hanReader.getInt((int)Aidon_List2_1p::ActiveImportPower);
data["Q"] = hanReader.getInt((int)Aidon_List2_1p::ReactiveExportPower);
data["I1"] = ((double) hanReader.getInt((int)Aidon_List2_1p::Current)) / 10;
data["U1"] = ((double) hanReader.getInt((int)Aidon_List2_1p::Voltage)) / 10;
}
else if (listSize == (int)Aidon::List3)
{

2
Arduino Code/Arduino Libraries/HanReader/src/Aidon.h
View File

@ -8,7 +8,7 @@ enum class Aidon
{
List1 = 0x01,
List2 = 0x0D,
List2_p1 = 0x09,
List2_1p = 0x09,
List3 = 0x12
};