From 6559be87b76ec61587a4aef6ea65e5a3ef1f3c2f Mon Sep 17 00:00:00 2001
From: Jussi Vestman <jussi.vestman@gmail.com>
Date: Sat, 27 Feb 2016 13:50:15 +0200
Subject: [PATCH] KlikAanKlikUit json support

---
 src/devices/newkaku.c | 51 +++++++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/devices/newkaku.c b/src/devices/newkaku.c
index 4d03c554..3de653cb 100644
--- a/src/devices/newkaku.c
+++ b/src/devices/newkaku.c
@@ -1,4 +1,6 @@
 #include "rtl_433.h"
+#include "util.h"
+#include "data.h"
 
 static int newkaku_callback(bitbuffer_t *bitbuffer) {
     /* Two bits map to 2 states, 0 1 -> 0 and 1 1 -> 1 */
@@ -10,6 +12,7 @@ static int newkaku_callback(bitbuffer_t *bitbuffer) {
     /*- 4  bit:  unit*/
     /*- [4 bit:  dim level. Present if [dim] is used, but might be present anyway...]*/
     /*- stop pulse: 1T high, 40T low */
+    data_t *data;
     bitrow_t *bb = bitbuffer->bb;
     int i;
     uint8_t tmp = 0;
@@ -17,6 +20,10 @@ static int newkaku_callback(bitbuffer_t *bitbuffer) {
     uint8_t packet = 0;
     uint8_t bitcount = 0;
     uint32_t kakuid = 0;
+    uint8_t dv = 0;
+    char *group_call, *command, *dim;
+    char time_str[LOCAL_TIME_BUFLEN];
+    local_time_str(0, time_str);
 
     if (bb[0][0] == 0xac || bb[0][0] == 0xb2) {//allways starts with ac or b2
         // first bit is from startbit sequence, not part of payload!
@@ -55,7 +62,6 @@ static int newkaku_callback(bitbuffer_t *bitbuffer) {
                 kakuid = kakuid << 1;
                 //add 0
             } else {
-                //fprintf(stdout, " Packet error, no newkaku!!\n", tmp << bitcount);
                 return 0; //00 and 11 indicates packet error. no valid packet! do exit
             }
         }
@@ -77,16 +83,12 @@ static int newkaku_callback(bitbuffer_t *bitbuffer) {
                 return 0; //00 and 11 indicates packet error. Do exit, no valid packet
             }
         }
-        fprintf(stdout, "NewKaku event:\n");
-        fprintf(stdout, "Model      = NewKaKu on/off/dimmer switch\n");
-        fprintf(stdout, "KakuId     = %d (H%.2X)\n", kakuid, kakuid);
-        fprintf(stdout, "Unit       = %d (H%.2X)\n", unit, unit);
-        fprintf(stdout, "Group Call = %s\n", (((bb[0][6] & (0x04)) == 0x04)&((bb[0][6] & (0x02)) == 0)) ? "Yes" : "No");
-        fprintf(stdout, "Command    = %s\n", (((bb[0][6] & (0x01)) == 0x01)&((bb[0][7] & (0x80)) == 0)) ? "On" : "Off");
+        group_call = (((bb[0][6] & (0x04)) == 0x04)&((bb[0][6] & (0x02)) == 0)) ? "Yes" : "No";
+        command = (((bb[0][6] & (0x01)) == 0x01)&((bb[0][7] & (0x80)) == 0)) ? "On" : "Off";
         if (((bb[0][6] & (0x01)) == 0x01)&((bb[0][7] & (0x80)) == 0x80)) {//11 indicates DIM command, 4 extra bits indicate DIM value
-            fprintf(stdout, "Dim        = Yes\n");
+            dim = "Yes";
             tmp = bb[0][8] << 1; // get packet, loose first bit
-            uint8_t dv = 0;
+
             if ((bb[0][9]&(1 << 7)) != 0) {// if bit is set Add to current packet
                 tmp++;
                 for (bitcount = 0; bitcount < 8; bitcount += 2) {//process last bit outside
@@ -103,18 +105,38 @@ static int newkaku_callback(bitbuffer_t *bitbuffer) {
                     }
                 }
             }
-            fprintf(stdout, "Dim Value  = %d\n", dv);
         } else {
-            fprintf(stdout, "Dim        = No\n");
-            fprintf(stdout, "Dim Value  = 0\n");
+            dim = "No";
         }
-        fprintf(stdout, "%02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
-                bb[0][0], bb[0][1], bb[0][2], bb[0][3], bb[0][4], bb[0][5], bb[0][6], bb[0][7], bb[0][8]);
+
+        data = data_make("time",          "",            DATA_STRING, time_str,
+                         "model",         "",            DATA_STRING, "KlikAanKlikUit Wireless Switch",
+                         "id",            "",            DATA_INT, kakuid,
+                         "unit",          "",            DATA_INT, unit,
+                         "group_call",    "",            DATA_STRING, group_call,
+                         "command",       "",            DATA_STRING, command,
+                         "dim",           "",            DATA_STRING, dim,
+                         "dim_value",     "",            DATA_INT, dv,
+                         NULL);
+        data_acquired_handler(data);
+
         return 1;
     }
     return 0;
 }
 
+static char *output_fields[] = {
+    "time",
+    "model",
+    "id",
+    "unit",
+    "group_call",
+    "command",
+    "dim",
+    "dim_value",
+    NULL
+};
+
 r_device newkaku = {
     .name           = "KlikAanKlikUit Wireless Switch",
     .modulation     = OOK_PULSE_PPM_RAW,
@@ -124,4 +146,5 @@ r_device newkaku = {
     .json_callback  = &newkaku_callback,
     .disabled       = 0,
     .demod_arg      = 0,
+    .fields         = output_fields
 };