From de41a39336aa91c1c2efd9f7dcbce2e5c2566306 Mon Sep 17 00:00:00 2001
From: "Christian W. Zuckschwerdt" <christian@zuckschwerdt.org>
Date: Tue, 20 Nov 2018 13:38:18 +0100
Subject: [PATCH] Add some missing csv field declarations

---
 src/devices/akhan_100F14.c   |  1 +
 src/devices/blyss.c          |  1 +
 src/devices/calibeur.c       |  3 ++-
 src/devices/chuango.c        |  1 +
 src/devices/esperanza_ews.c  |  1 +
 src/devices/generic_remote.c | 10 ++++++++++
 src/devices/ht680.c          |  5 +++--
 src/devices/kerui.c          |  1 +
 8 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/devices/akhan_100F14.c b/src/devices/akhan_100F14.c
index ad653d30..4cd36669 100644
--- a/src/devices/akhan_100F14.c
+++ b/src/devices/akhan_100F14.c
@@ -70,4 +70,5 @@ r_device akhan_100F14 = {
     .json_callback = &akhan_rke_callback,
     .disabled      = 0,
     .demod_arg     = 0,
+    .fields        = output_fields,
 };
diff --git a/src/devices/blyss.c b/src/devices/blyss.c
index a3a9ec4a..c0aa046a 100644
--- a/src/devices/blyss.c
+++ b/src/devices/blyss.c
@@ -84,4 +84,5 @@ r_device blyss = {
 	.json_callback  = &blyss_callback,
 	.disabled       = 0,
 	.demod_arg      = 0,
+    .fields         = output_fields,
 };
diff --git a/src/devices/calibeur.c b/src/devices/calibeur.c
index 753ef996..efd8425a 100644
--- a/src/devices/calibeur.c
+++ b/src/devices/calibeur.c
@@ -111,5 +111,6 @@ r_device calibeur_RF104 = {
 	.tolerance      = 0,	// raw mode
 	.json_callback  = &calibeur_rf104_callback,
 	.disabled       = 0,
-	.demod_arg      = 0		// not used
+	.demod_arg      = 0,	// not used
+	.fields         = output_fields,
 };
diff --git a/src/devices/chuango.c b/src/devices/chuango.c
index f2b741b2..1ccee475 100644
--- a/src/devices/chuango.c
+++ b/src/devices/chuango.c
@@ -97,4 +97,5 @@ r_device chuango = {
     .json_callback  = &chuango_callback,
     .disabled       = 0,
     .demod_arg      = 0,
+    .fields         = output_fields,
 };
diff --git a/src/devices/esperanza_ews.c b/src/devices/esperanza_ews.c
index 2f0e5bef..00866eb7 100644
--- a/src/devices/esperanza_ews.c
+++ b/src/devices/esperanza_ews.c
@@ -122,4 +122,5 @@ r_device esperanza_ews = {
     .json_callback = &esperanza_ews_callback,
     .disabled      = 0,
     .demod_arg     = 0,
+    .fields        = output_fields,
 };
diff --git a/src/devices/generic_remote.c b/src/devices/generic_remote.c
index a3c5874d..d5981c92 100644
--- a/src/devices/generic_remote.c
+++ b/src/devices/generic_remote.c
@@ -87,6 +87,15 @@ static int generic_remote_callback(bitbuffer_t *bitbuffer) {
 }
 
 
+static char *output_fields[] = {
+    "time",
+    "model"
+    "id"
+    "cmd",
+    "tristate",
+    NULL
+};
+
 r_device generic_remote = {
 	.name			= "Generic Remote SC226x EV1527",
 	.modulation		= OOK_PULSE_PWM_PRECISE,
@@ -98,4 +107,5 @@ r_device generic_remote = {
 	.json_callback	= &generic_remote_callback,
 	.disabled		= 0,
 	.demod_arg		= 0,
+    .fields         = output_fields,
 };
diff --git a/src/devices/ht680.c b/src/devices/ht680.c
index c3422087..c3acb4cd 100644
--- a/src/devices/ht680.c
+++ b/src/devices/ht680.c
@@ -58,10 +58,10 @@ static int ht680_callback(bitbuffer_t *bitbuffer) {
 }
 
 static char *output_fields[] = {
+	"time",
 	"model",
 	"tristate",
 	"address",
-	"data",
 	"button1",
 	"button2",
 	"button3",
@@ -77,5 +77,6 @@ r_device ht680 = {
 	.reset_limit   = 13000,
 	.json_callback = &ht680_callback,
 	.disabled      = 0,
-	.demod_arg     = 1
+	.demod_arg     = 1,
+    .fields        = output_fields,
 };
diff --git a/src/devices/kerui.c b/src/devices/kerui.c
index f65e1a27..3618dd5e 100644
--- a/src/devices/kerui.c
+++ b/src/devices/kerui.c
@@ -77,4 +77,5 @@ r_device kerui = {
     .json_callback = &kerui_callback,
     .disabled      = 0,
     .demod_arg     = 0,
+    .fields         = output_fields,
 };