From 00f34f00fff3c0af7667fc13ba6e2bbfe97f6126 Mon Sep 17 00:00:00 2001
From: Roar Fredriksen <roarfred@gmail.com>
Date: Fri, 22 Sep 2017 00:46:26 +0200
Subject: [PATCH] Ported Kaifa class to Arduino. Reading list ID and time...

---
 Code/ESPDebugger/ESPDebugger.ino              | 15 ++++-
 Code/ESPDebugger/KaifaHan.cpp                 | 57 +++++++++++++++++++
 Code/ESPDebugger/KaifaHan.h                   | 27 +++++++++
 Code/HanDebugger/HanDebugger/KaifaHanBeta.cs  |  2 +-
 .../HanDebuggerTest/KaifaHanBetaTest.cs       |  4 +-
 5 files changed, 101 insertions(+), 4 deletions(-)
 create mode 100644 Code/ESPDebugger/KaifaHan.cpp
 create mode 100644 Code/ESPDebugger/KaifaHan.h

diff --git a/Code/ESPDebugger/ESPDebugger.ino b/Code/ESPDebugger/ESPDebugger.ino
index 62e2d24f..a3854b5f 100644
--- a/Code/ESPDebugger/ESPDebugger.ino
+++ b/Code/ESPDebugger/ESPDebugger.ino
@@ -14,10 +14,12 @@
 
 #include "DlmsReader.h"
 #include "Crc16.h"
+#include "KaifaHan.h"
 
 DlmsReader reader;
 byte buffer[512];
 int bytesRead;
+KaifaHan kaifa;
 
 void setup() {
   // Initialize the Serial1 port for debugging
@@ -41,11 +43,22 @@ void loop() {
   {
     byte newByte = Serial.read();
     //if (newByte < 0x10) Serial1.print("0");
-    //Serial1.print(newByte, HEX);
+    Serial1.print(newByte, HEX);
 
     if (reader.Read(newByte))
     {
       bytesRead = reader.GetRawData(buffer, 0, 512);
+
+      byte list = kaifa.GetListID(buffer, 0, bytesRead);
+      Serial1.println("");
+      Serial1.print("List #");
+      Serial1.print(list, HEX);
+
+      time_t time = kaifa.GetPackageTime(buffer, 0, bytesRead);
+      Serial1.print(" (time is ");
+      Serial1.print(time);
+      Serial1.println("):");
+      
       writeAndEmptyBuffer();
     }
   }
diff --git a/Code/ESPDebugger/KaifaHan.cpp b/Code/ESPDebugger/KaifaHan.cpp
new file mode 100644
index 00000000..f0322bee
--- /dev/null
+++ b/Code/ESPDebugger/KaifaHan.cpp
@@ -0,0 +1,57 @@
+#include "KaifaHan.h"
+
+
+byte KaifaHan::GetListID(byte *buffer, int start, int length)
+{
+  if (length > 23)
+  {
+    byte list = buffer[start + 23];
+    if (list == List1) return List1;
+    if (list == List2) return List2;
+    if (list == List3) return List3;
+  }
+  return ListUnknown;
+}
+
+long KaifaHan::GetPackageTime(byte *buffer, int start, int length)
+{
+  const int timeStart = 10;
+  int year = buffer[start + timeStart] << 8 |
+      buffer[start + timeStart + 1];
+  
+  int month = buffer[start + timeStart + 2];
+  int day = buffer[start + timeStart + 3];
+  int hour = buffer[start + timeStart + 5];
+  int minute = buffer[start + timeStart + 6];
+  int second = buffer[start + timeStart + 7];
+
+  return toUnixTime(year, month, day, hour, minute, second);
+}
+
+time_t KaifaHan::toUnixTime(int year, int month, int day, int hour, int minute, int second)
+{
+  byte daysInMonth[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+  long secondsPerMinute = 60;
+  long secondsPerHour = secondsPerMinute * 60;
+  long secondsPerDay = secondsPerHour * 24;
+
+  long time = (year - 1970) * secondsPerDay * 365L;
+
+  for (int yearCounter = 1970; yearCounter<year; yearCounter++)
+    if ((yearCounter % 4 == 0) && ((yearCounter % 100 != 0) || (yearCounter % 400 == 0)))
+      time += secondsPerDay;
+
+  if (month > 2 && (year % 4 == 0) && ((year % 100 != 0) || (year % 400 == 0)))
+    time += secondsPerDay;
+
+  for (int monthCounter = 1; monthCounter<month; monthCounter++)
+    time += daysInMonth[monthCounter - 1] * secondsPerDay;
+
+  time += (day - 1) * secondsPerDay;
+  time += hour * secondsPerHour;
+  time += minute * secondsPerMinute;
+  time += second;
+
+  return (time_t)time;
+}
+
diff --git a/Code/ESPDebugger/KaifaHan.h b/Code/ESPDebugger/KaifaHan.h
new file mode 100644
index 00000000..34ebd1cb
--- /dev/null
+++ b/Code/ESPDebugger/KaifaHan.h
@@ -0,0 +1,27 @@
+#ifndef _KAIFAHAN_h
+#define _KAIFAHAN_h
+
+#if defined(ARDUINO) && ARDUINO >= 100
+  #include "arduino.h"
+#else
+  #include "WProgram.h"
+#endif
+
+class KaifaHan
+{
+  public:
+    const byte ListUnknown = 0x00;
+    const byte List1 = 0x01;
+    const byte List2 = 0x0D;
+    const byte List3 = 0x12;
+    byte GetListID(byte *buffer, int start, int length);
+    long GetPackageTime(byte *buffer, int start, int length);
+  protected:
+    
+    
+  private:
+  time_t toUnixTime(int year, int month, int day, int hour, int minute, int second);
+};
+
+
+#endif
diff --git a/Code/HanDebugger/HanDebugger/KaifaHanBeta.cs b/Code/HanDebugger/HanDebugger/KaifaHanBeta.cs
index 3416731c..8eeec67e 100644
--- a/Code/HanDebugger/HanDebugger/KaifaHanBeta.cs
+++ b/Code/HanDebugger/HanDebugger/KaifaHanBeta.cs
@@ -15,7 +15,7 @@ namespace HanDebugger
         public const byte List2 = 0x0D;
         public const byte List3 = 0x12;
 
-        public static byte GetPackageID(byte[] package, int start, int length)
+        public static byte GetListID(byte[] package, int start, int length)
         {
             switch (package[start + 23])
             {
diff --git a/Code/HanDebugger/HanDebuggerTest/KaifaHanBetaTest.cs b/Code/HanDebugger/HanDebuggerTest/KaifaHanBetaTest.cs
index 8b5cd00d..31ef4648 100644
--- a/Code/HanDebugger/HanDebuggerTest/KaifaHanBetaTest.cs
+++ b/Code/HanDebugger/HanDebuggerTest/KaifaHanBetaTest.cs
@@ -20,7 +20,7 @@ namespace HanDebuggerTest
             var lines = packages.Select(line => line.Trim().Split(' ').Select(v => (byte)int.Parse(v, System.Globalization.NumberStyles.HexNumber)).ToArray()).ToArray();
             foreach (var line in lines)
             {
-                byte list = KaifaHanBeta.GetPackageID(line, 0, line.Length);
+                byte list = KaifaHanBeta.GetListID(line, 0, line.Length);
                 if (packageCount.ContainsKey(list))
                     packageCount[list]++;
                 else
@@ -54,7 +54,7 @@ namespace HanDebuggerTest
             var lines = packages.Select(line => line.Trim().Split(' ').Select(v => (byte)int.Parse(v, System.Globalization.NumberStyles.HexNumber)).ToArray()).ToArray();
             foreach (var line in lines)
             {
-                if (KaifaHanBeta.GetPackageID(line, 0, line.Length) == KaifaHanBeta.List1)
+                if (KaifaHanBeta.GetListID(line, 0, line.Length) == KaifaHanBeta.List1)
                 {
                     consumption.Add(KaifaHanBeta.GetInt(0, line, 0, line.Length));
                 }