From 1ae94302291889397745659ebf1934e7696da482 Mon Sep 17 00:00:00 2001
From: Roar Fredriksen <roarfred@gmail.com>
Date: Wed, 25 Oct 2017 23:00:56 +0200
Subject: [PATCH] Updated Kaifa names to conform to Kamstrup

---
 Code/Arduino/HanReader/src/Kaifa.h | 58 +++++++++++++++---------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/Code/Arduino/HanReader/src/Kaifa.h b/Code/Arduino/HanReader/src/Kaifa.h
index 8fdb0c93..26b7cb5f 100644
--- a/Code/Arduino/HanReader/src/Kaifa.h
+++ b/Code/Arduino/HanReader/src/Kaifa.h
@@ -7,49 +7,51 @@ enum class Kaifa : byte {
 	List3 = 0x12
 };
 
-enum class Kaifa_List1_ObisObjects {
+enum class Kaifa_List1 {
+	Time,
+	ListID,
 	ActivePowerImported
 };
 
-enum class Kaifa_List2_ObisObjects {
+enum class Kaifa_List2 {
 	Time,
 	ListID,
 	ObisListVersionIdentifier,
 	MeterID,
 	MeterType,
-	ActivePowerImported,
-	ActivePowerExported,
-	ReactivePowerImported,
-	ReactivePowerExported,
-	CurrentPhaseL1,
-	CurrentPhaseL2,
-	CurrentPhaseL3,
-	VoltagePhaseL1,
-	VoltagePhaseL2,
-	VoltagePhaseL3
+	ActiveImportPower,
+	ActiveExportPower,
+	ReactiveImportPower,
+	ReactiveExportPower,
+	CurrentL1,
+	CurrentL2,
+	CurrentL3,
+	VoltageL1,
+	VoltageL2,
+	VoltageL3
 };
 
-enum class Kaifa_List3_ObisObjects {
+enum class Kaifa_List3 {
 	Time,
 	ListID,
 	ObisListVersionIdentifier,
 	MeterID,
 	MeterType,
-	ActivePowerImported,
-	ActivePowerExported,
-	ReactivePowerImported,
-	ReactivePowerExported,
-	CurrentPhaseL1,
-	CurrentPhaseL2,
-	CurrentPhaseL3,
-	VoltagePhaseL1,
-	VoltagePhaseL2,
-	VoltagePhaseL3,
-	ClockAndDate,
-	TotalActiveEnergyImported,
-	TotalActiveEnergyExported,
-	TotalReactiveEnergyImported,
-	TotalReactiveEnergyExported
+	ActiveImportPower,
+	ActiveExportPower,
+	ReactiveImportPower,
+	ReactiveExportPower,
+	CurrentL1,
+	CurrentL2,
+	CurrentL3,
+	VoltageL1,
+	VoltageL2,
+	VoltageL3,
+	MeterClock,
+	CumulativeActiveImportEnergy,
+	CumulativeActiveExportEnergy,
+	CumulativeReactiveImportEnergy,
+	CumulativeReactiveExportEnergy
 };
 
 #endif