From 643c9a5e208d1c44a9a4830f0d17e7d114977642 Mon Sep 17 00:00:00 2001 From: Vegar Westerlund Date: Fri, 7 Jun 2019 22:49:49 +0200 Subject: [PATCH] Minor fixes --- .../Arduino Libraries/HanToJson/src/HanToJson.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Arduino Code/Arduino Libraries/HanToJson/src/HanToJson.cpp b/Arduino Code/Arduino Libraries/HanToJson/src/HanToJson.cpp index ef913079..bf434dbd 100644 --- a/Arduino Code/Arduino Libraries/HanToJson/src/HanToJson.cpp +++ b/Arduino Code/Arduino Libraries/HanToJson/src/HanToJson.cpp @@ -21,7 +21,7 @@ static void hanToJsonKaifa3phase(int listSize, JsonObject& data, HanReader& hanR data["U3"] = hanReader.getInt( (int)Kaifa_List3::VoltageL3); } - if (listSize > (int)Kaifa::List3) // Note: Bug in Kaifa? (Should have been '>=') + if (listSize >= (int)Kaifa::List3) { data["tPI"] = hanReader.getInt( (int)Kaifa_List3::CumulativeActiveImportEnergy); data["tPO"] = hanReader.getInt( (int)Kaifa_List3::CumulativeActiveExportEnergy); @@ -43,7 +43,7 @@ static void hanToJsonKaifa1phase(int listSize, JsonObject& data, HanReader& hanR data["U1"] = hanReader.getInt( (int)Kaifa_List31::VoltageL1); } - if (listSize > (int)Kaifa::List31) + if (listSize >= (int)Kaifa::List31) { data["tPI"] = hanReader.getInt( (int)Kaifa_List31::CumulativeActiveImportEnergy); data["tPO"] = hanReader.getInt( (int)Kaifa_List31::CumulativeActiveExportEnergy); @@ -70,6 +70,9 @@ static void hanToJsonKaifa(JsonObject& data, HanReader& hanReader, Stream *debug case (int)Kaifa::List21: case (int)Kaifa::List31: return hanToJsonKaifa1phase(listSize, data, hanReader, debugger); + default: + if (debugger) debugger->printf("Warning: Unknown listSize %d\n", listSize); + return; } } @@ -173,6 +176,9 @@ static void hanToJsonKamstrup(JsonObject& data, HanReader& hanReader, Stream *de case (int)Kamstrup::List3: case (int)Kamstrup::List4: return hanToJsonKamstrup1phase(listSize, data, hanReader, debugger); + default: + if (debugger) debugger->printf("Warning: Unknown listSize %d\n", listSize); + return; } }