mwalbeck/rtl_433
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert some device IDs and other fields to new model ()

Browse source
This commit is contained in:
Helge Weissig 2019-05-06 07:42:30 -07:00 • committed by Christian W. Zuckschwerdt
parent bc3603992f
commit 82d0f551a5
4 changed files with 21 additions and 12 deletions

5
.gitignore vendored
View file

@ -56,3 +56,8 @@ build*/
_*/
rtl_433_tests
.idea
cmake-build-debug/
.DS_Store

14
src/devices/acurite.c
View file

@ -557,7 +557,7 @@ static int acurite_txr_callback(r_device *decoder, bitbuffer_t *bitbuf)
/* clang-format off */
data = data_make(
"model", "", DATA_STRING, _X("Acurite-5n1","Acurite 5n1 sensor"),
"sensor_id", NULL, DATA_INT, sensor_id, // @todo normaiize to "id" at 1.0 release.
_X("id", "sensor_id"), NULL, DATA_INT, sensor_id,
"channel", NULL, DATA_STRING, &channel_str,
"sequence_num", NULL, DATA_INT, sequence_num,
"battery", NULL, DATA_STRING, battery_low ? "OK" : "LOW",
@ -582,7 +582,7 @@ static int acurite_txr_callback(r_device *decoder, bitbuffer_t *bitbuf)
/* clang-format off */
data = data_make(
"model", "", DATA_STRING, _X("Acurite-5n1","Acurite 5n1 sensor"),
"sensor_id", NULL, DATA_INT, sensor_id, // @todo normalize to "id" at 1.0 release.
_X("id", "sensor_id"), NULL, DATA_INT, sensor_id,
"channel", NULL, DATA_STRING, &channel_str,
"sequence_num", NULL, DATA_INT, sequence_num,
"battery", NULL, DATA_STRING, battery_low ? "OK" : "LOW",
@ -609,7 +609,7 @@ static int acurite_txr_callback(r_device *decoder, bitbuffer_t *bitbuf)
/* clang-format off */
data = data_make(
"model", "", DATA_STRING, _X("Acurite-3n1","Acurite 3n1 sensor"),
"sensor_id", NULL, DATA_FORMAT, "0x%02X", DATA_INT, sensor_id,
_X("id", "sensor_id"), NULL, DATA_FORMAT, "0x%02X", DATA_INT, sensor_id,
"channel", NULL, DATA_STRING, &channel_str,
"sequence_num", NULL, DATA_INT, sequence_num,
"battery", NULL, DATA_STRING, battery_low ? "OK" : "LOW",
@ -949,7 +949,7 @@ static int acurite_00275rm_callback(r_device *decoder, bitbuffer_t *bitbuf)
ptempc = (((signal[0][7] & 0x0f) << 8) | signal[0][8]) * 0.1 - 100;
/* clang-format off */
data = data_append(data,
"ptemperature_C", "Celsius", DATA_FORMAT, "%.1f C", DATA_DOUBLE, ptempc,
_X("temperature_1_C", "ptemperature_C"), "Celsius", DATA_FORMAT, "%.1f C", DATA_DOUBLE, ptempc,
"mic", "Integrity", DATA_STRING, "CRC",
NULL);
/* clang-format on */
@ -960,8 +960,8 @@ static int acurite_00275rm_callback(r_device *decoder, bitbuffer_t *bitbuf)
phumidity = signal[0][9] & 0x7f;
/* clang-format off */
data = data_append(data,
"ptemperature_C", "Celsius", DATA_FORMAT, "%.1f C", DATA_DOUBLE, ptempc,
"phumidity", "Humidity", DATA_INT, phumidity,
_X("temperature_1_C", "ptemperature_C"), "Celsius", DATA_FORMAT, "%.1f C", DATA_DOUBLE, ptempc,
_X("humidity_1", "phumidity"), "Humidity", DATA_INT, phumidity,
"mic", "Integrity", DATA_STRING, "CRC",
NULL);
/* clang-format on */
@ -1139,6 +1139,8 @@ static char *acurite_00275rm_output_fields[] = {
"temperature_C",
"humidity",
"water",
"temperature_1_C",
"humidity_1",
"ptemperature_C",
"phumidity",
"mic",

4
src/devices/elv.c
View file

@ -79,7 +79,7 @@ static int em1000_callback(r_device *decoder, bitbuffer_t *bitbuffer)
static char *elv_em1000_output_fields[] = {
"model",
"id"
"id",
"seq",
"total",
"current",
@ -177,7 +177,7 @@ static int ws2000_callback(r_device *decoder, bitbuffer_t *bitbuffer)
static char *elv_ws2000_output_fields[] = {
"model",
"id"
"id",
"subtype",
"temperature",
"humidity",

10
src/devices/x10_rf.c
View file

@ -69,8 +69,8 @@ static int x10_rf_callback(r_device *decoder, bitbuffer_t *bitbuffer) {
data = data_make(
"model", "", DATA_STRING, "X10-RF",
"houseid", "", DATA_STRING, housecode,
"deviceid", "", DATA_INT, bDeviceCode + 1,
_X("id", "deviceid"), "", DATA_INT, bDeviceCode + 1,
_X("channel", "houseid"), "", DATA_STRING, housecode,
"state", "", DATA_STRING, state ? "ON" : "OFF",
"data", "", DATA_FORMAT, "%08x", DATA_INT, code,
NULL);
@ -82,8 +82,10 @@ static int x10_rf_callback(r_device *decoder, bitbuffer_t *bitbuffer) {
static char *output_fields[] = {
"model",
"houseid"
"deviceid",
"channel",
"id",
"houseid", // TODO: remove ??
"deviceid", // TODO: remove ??
"state",
"data",
NULL