From 54b5c139f4acb49b5e17293fcdc83563ef55227b Mon Sep 17 00:00:00 2001
From: Roar Fredriksen <roarfred@gmail.com>
Date: Thu, 26 Oct 2017 00:34:56 +0200
Subject: [PATCH] Changing ListID to ListSize

---
 Code/Arduino/HanReader/src/HanReader.cpp |  6 +++---
 Code/Arduino/HanReader/src/HanReader.h   |  4 ++--
 Code/Arduino/HanReader/src/Kaifa.h       | 10 +++++-----
 Code/Arduino/HanReader/src/Kamstrup.h    |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Code/Arduino/HanReader/src/HanReader.cpp b/Code/Arduino/HanReader/src/HanReader.cpp
index 316d845a..02993f11 100644
--- a/Code/Arduino/HanReader/src/HanReader.cpp
+++ b/Code/Arduino/HanReader/src/HanReader.cpp
@@ -35,7 +35,7 @@ bool HanReader::read(byte data)
 	if (reader.Read(data))
 	{
 		bytesRead = reader.GetRawData(buffer, 0, 512);
-		list = getInt(1, buffer, 0, bytesRead);
+		listSize = getInt(1, buffer, 0, bytesRead);
 		return true;
 	}
 }
@@ -50,9 +50,9 @@ bool HanReader::read()
 	return false;
 }
 
-int HanReader::getList()
+int HanReader::getListSize()
 {
-	return list;
+	return listSize;
 }
 
 time_t HanReader::getPackageTime()
diff --git a/Code/Arduino/HanReader/src/HanReader.h b/Code/Arduino/HanReader/src/HanReader.h
index b34e3d6a..49175964 100644
--- a/Code/Arduino/HanReader/src/HanReader.h
+++ b/Code/Arduino/HanReader/src/HanReader.h
@@ -22,7 +22,7 @@ public:
 	void setup(HardwareSerial *hanPort, unsigned long baudrate, SerialConfig config, Stream *debugPort);
 	bool read();
 	bool read(byte data);
-	int getList();
+	int getListSize();
 	time_t getPackageTime();
 	int getInt(int objectId);
 	String getString(int objectId);
@@ -34,7 +34,7 @@ private:
 	byte buffer[512];
 	int bytesRead;
 	DlmsReader reader;
-	int list;
+	int listSize;
 
 	int findValuePosition(int dataPosition, byte *buffer, int start, int length);
 
diff --git a/Code/Arduino/HanReader/src/Kaifa.h b/Code/Arduino/HanReader/src/Kaifa.h
index 26b7cb5f..54a7b2f8 100644
--- a/Code/Arduino/HanReader/src/Kaifa.h
+++ b/Code/Arduino/HanReader/src/Kaifa.h
@@ -9,14 +9,14 @@ enum class Kaifa : byte {
 
 enum class Kaifa_List1 {
 	Time,
-	ListID,
+	ListSize,
 	ActivePowerImported
 };
 
 enum class Kaifa_List2 {
 	Time,
-	ListID,
-	ObisListVersionIdentifier,
+	ListSize,
+	ListVersionIdentifier,
 	MeterID,
 	MeterType,
 	ActiveImportPower,
@@ -33,8 +33,8 @@ enum class Kaifa_List2 {
 
 enum class Kaifa_List3 {
 	Time,
-	ListID,
-	ObisListVersionIdentifier,
+	ListSize,
+	ListVersionIdentifier,
 	MeterID,
 	MeterType,
 	ActiveImportPower,
diff --git a/Code/Arduino/HanReader/src/Kamstrup.h b/Code/Arduino/HanReader/src/Kamstrup.h
index c7b20ce0..c06f979a 100644
--- a/Code/Arduino/HanReader/src/Kamstrup.h
+++ b/Code/Arduino/HanReader/src/Kamstrup.h
@@ -13,7 +13,7 @@ enum class Kamstrup
 enum class Kamstrup_List1
 {
 	Time,
-	ListID,
+	ListSize,
 	ListVersionIdentifier,
 	MeterID_OBIS,
 	MeterID,
@@ -45,7 +45,7 @@ enum class Kamstrup_List1
 enum class Kamstrup_List2
 {
 	Time,
-	ListID,
+	ListSize,
 	ListVersionIdentifier,
 	MeterID_OBIS,
 	MeterID,