From 49f56b38b2e04fdfca4138cd6cd5d817ca9ea141 Mon Sep 17 00:00:00 2001
From: "Christian W. Zuckschwerdt" <christian@zuckschwerdt.org>
Date: Sat, 13 May 2017 12:54:51 +0200
Subject: [PATCH] harmonize device data output to model instead of device or
 make, and crc instead of checksum

---
 src/devices/akhan_100F14.c | 5 ++---
 src/devices/blyss.c        | 6 ++----
 src/devices/kerui.c        | 5 ++---
 src/devices/steelmate.c    | 4 ++--
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/devices/akhan_100F14.c b/src/devices/akhan_100F14.c
index 5b9f06f9..0288cae4 100644
--- a/src/devices/akhan_100F14.c
+++ b/src/devices/akhan_100F14.c
@@ -43,7 +43,7 @@ static int akhan_rke_callback(bitbuffer_t *bitbuffer) {
 
 		if (isAkhan == 1) {
 			data = data_make(	"time",		"",				DATA_STRING,	time_str,
-									"device",	"",				DATA_STRING,	"Akhan 100F14 remote keyless entry",
+									"model",	"",				DATA_STRING,	"Akhan 100F14 remote keyless entry",
 									"id",			"ID (20bit)",	DATA_FORMAT, 	"0x%x", 	DATA_INT, ID,
 									"data",		"Data (4bit)",	DATA_STRING,	CMD,
 									NULL);
@@ -58,10 +58,9 @@ static int akhan_rke_callback(bitbuffer_t *bitbuffer) {
 
 static char *output_fields[] = {
     "time",
-    "device",
+    "model",
     "id",
     "data",
-    "other",
     NULL
 };
 
diff --git a/src/devices/blyss.c b/src/devices/blyss.c
index f56c97d4..ffcefab6 100755
--- a/src/devices/blyss.c
+++ b/src/devices/blyss.c
@@ -33,9 +33,8 @@ static int blyss_dc5_uk_wh(bitbuffer_t *bitbuffer)
 			local_time_str(0, time_str);
 
 			data = data_make("time", "", DATA_STRING, time_str,
+				"model", "", DATA_STRING, "blyss dc5-uk-wh",
 				"type", "", DATA_STRING, "doorbell",
-				"make", "", DATA_STRING, "blyss",
-				"model", "", DATA_STRING, "dc5-uk-wh",
 				"mode", "", DATA_STRING, "ringing",
 				NULL);
 			data_acquired_handler(data);
@@ -50,9 +49,8 @@ static int blyss_dc5_uk_wh(bitbuffer_t *bitbuffer)
 
 static char *output_fields[] = {
 	"time",
-	"type",
-	"make",
 	"model",
+	"type",
 	"mode",
 	NULL
 };
diff --git a/src/devices/kerui.c b/src/devices/kerui.c
index fac19c12..4f696449 100644
--- a/src/devices/kerui.c
+++ b/src/devices/kerui.c
@@ -41,7 +41,7 @@ static int kerui_callback(bitbuffer_t *bitbuffer) {
 
 		if (isKerui == 1) {
 			data = data_make(	"time",		"",				DATA_STRING,	time_str,
-									"device",	"",				DATA_STRING,	"Kerui PIR Sensor",
+									"model",	"",				DATA_STRING,	"Kerui PIR Sensor",
 									"id",			"ID (20bit)",	DATA_FORMAT, 	"0x%x", 	DATA_INT, ID,
 									"data",		"Data (4bit)",	DATA_STRING,	CMD,
 									NULL);
@@ -58,10 +58,9 @@ static int kerui_callback(bitbuffer_t *bitbuffer) {
 
 static char *output_fields[] = {
     "time",
-    "device",
+    "model",
     "id",
     "data",
-    "other",
     NULL
 };
 
diff --git a/src/devices/steelmate.c b/src/devices/steelmate.c
index 9086734d..925d276a 100644
--- a/src/devices/steelmate.c
+++ b/src/devices/steelmate.c
@@ -87,7 +87,7 @@ static int steelmate_callback(bitbuffer_t *bitbuffer) {
 
 		data = data_make("time", "", DATA_STRING, time_str,
 			"type", "", DATA_STRING, "TPMS",
-			"make", "", DATA_STRING, "Steelmate",
+			"model", "", DATA_STRING, "Steelmate",
 			"id", "", DATA_STRING, sensorIDhex,
 			"pressure_PSI", "", DATA_DOUBLE, pressurePSI,
 			"temperature_F", "", DATA_DOUBLE, (float)tempFahrenheit,
@@ -106,7 +106,7 @@ static int steelmate_callback(bitbuffer_t *bitbuffer) {
 static char *output_fields[] = {
 	"time",
 	"type",
-	"make",
+	"model",
 	"id",
 	"pressure_PSI",
 	"temperature_F",