mirror/rtl_433
1
0
Fork 0
mirror of https://github.com/merbanan/rtl_433.git synced 2026-05-19 15:25:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove macros to clear up name/model

Browse Source
This commit is contained in:
Christian W. Zuckschwerdt
2018-10-16 20:16:34 +02:00
parent d1c726c22f
commit b6f05f8667
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/devices/thermopro_tp11.c
View File

@@ -11,8 +11,6 @@
#include "rtl_433.h"
#include "util.h"
#define MODEL "Thermopro TP11 Thermometer"
/* normal sequence of bit rows:
[00] {33} db 41 57 c2 80 : 11011011 01000001 01010111 11000010 1
[01] {33} db 41 57 c2 80 : 11011011 01000001 01010111 11000010 1
@@ -73,7 +71,7 @@ static int thermopro_tp11_sensor_callback(bitbuffer_t *bitbuffer) {
local_time_str(0, time_str);
data = data_make("time", "", DATA_STRING, time_str,
"model", "", DATA_STRING, MODEL,
"model", "", DATA_STRING, "Thermopro TP11 Thermometer",
"id", "Id", DATA_FORMAT, "\t %d", DATA_INT, device,
"temperature_C", "Temperature", DATA_FORMAT, "%.01f C", DATA_DOUBLE, fTemp,
NULL);
@@ -90,7 +88,7 @@ static char *output_fields[] = {
};
r_device thermopro_tp11 = {
.name = MODEL,
.name = "Thermopro TP11 Thermometer",
.modulation = OOK_PULSE_PPM_RAW,
.short_limit = 956,
.long_limit = 1912,

4
src/devices/thermopro_tp12.c
View File

@@ -11,8 +11,6 @@
#include "rtl_433.h"
#include "util.h"
#define MODEL "Thermopro TP12 Thermometer"
/*
A normal sequence for the TP12:
@@ -99,7 +97,7 @@ static int thermopro_tp12_sensor_callback(bitbuffer_t *bitbuffer) {
local_time_str(0, time_str);
data = data_make("time", "", DATA_STRING, time_str,
"model", "", DATA_STRING, MODEL,
"model", "", DATA_STRING, "Thermopro TP12 Thermometer",
"id", "Id", DATA_FORMAT, "\t %d", DATA_INT, device,
"temperature_1_C", "Temperature 1 (Food)", DATA_FORMAT, "%.01f C", DATA_DOUBLE, fTemp1,
"temperature_2_C", "Temperature 2 (Barbecue)", DATA_FORMAT, "%.01f C", DATA_DOUBLE, fTemp2,

6
src/devices/wssensor.c
View File

@@ -25,7 +25,6 @@
#include "data.h"
#include "util.h"
#define MODEL "WS Temperature Sensor"
#define WS_PACKETLEN 24
#define WS_MINREPEATS 4
#define WS_REPEATS 23
@@ -73,7 +72,7 @@ static int wssensor_callback(bitbuffer_t *bitbuffer) {
local_time_str(0, time_str);
data = data_make("time", "", DATA_STRING, time_str,
"model", "", DATA_STRING, MODEL,
"model", "", DATA_STRING, "WS Temperature Sensor",
"id", "House Code", DATA_INT, sensor_id,
"channel", "Channel", DATA_INT, channel,
"battery", "Battery", DATA_STRING, battery_status ? "OK" : "LOW",
@@ -95,7 +94,7 @@ static char *output_fields[] = {
};
r_device wssensor = {
.name = MODEL,
.name = "WS Temperature Sensor",
.modulation = OOK_PULSE_PPM_RAW,
.short_limit = 1400,
.long_limit = 2400,
@@ -105,4 +104,3 @@ r_device wssensor = {
.demod_arg = 0,
.fields = output_fields
};