mirror/rtl_433
1
0
Fork 0
mirror of https://github.com/merbanan/rtl_433.git synced 2026-04-22 10:37:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

harmonize device data output to model instead of device or make, and crc instead of checksum

Browse Source
This commit is contained in:
Christian W. Zuckschwerdt
2017-05-13 12:54:51 +02:00
committed by Benjamin Larsson
parent 7fbefea13a
commit 49f56b38b2
4 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/devices/akhan_100F14.c
View File

@@ -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
};

6
src/devices/blyss.c
View File

@@ -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
};

5
src/devices/kerui.c
View File

@@ -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
};

4
src/devices/steelmate.c
View File

@@ -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",