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

minor: Fix FS20 code style

Browse source
This commit is contained in:
Christian W. Zuckschwerdt 2024-02-11 00:04:55 +01:00
parent 5ac7784e32
commit 4c5081dbba
4 changed files with 26 additions and 23 deletions

4
README.md
View file

@ -207,7 +207,7 @@ See [CONTRIBUTING.md](./docs/CONTRIBUTING.md).
[119] Bresser Weather Center 5-in-1
[120] Digitech XC-0324 / AmbientWeather FT005TH temp/hum sensor
[121] Opus/Imagintronix XT300 Soil Moisture
[122]* FS20
[122] FS20 / FHT
[123]* Jansite TPMS Model TY02S
[124] LaCrosse/ELV/Conrad WS7000/WS2500 weather sensors
[125] TS-FT002 Wireless Ultrasonic Tank Liquid Level Meter With Temperature Sensor
@ -258,7 +258,7 @@ See [CONTRIBUTING.md](./docs/CONTRIBUTING.md).
[170] LaCrosse Technology View LTV-WR1 Multi Sensor
[171] LaCrosse Technology View LTV-TH Thermo/Hygro Sensor
[172] Bresser Weather Center 6-in-1, 7-in-1 indoor, soil, new 5-in-1, 3-in-1 wind gauge, Froggit WH6000, Ventus C8488A
[173] Bresser Weather Center 7-in-1, Air Quality PM2.5/PM10 7009970, CO2 7009977, HCHO/VOC 7009978
[173] Bresser Weather Center 7-in-1, Air Quality PM2.5/PM10 7009970, CO2 7009977, HCHO/VOC 7009978 sensors
[174] EcoDHOME Smart Socket and MCEE Solar monitor
[175] LaCrosse Technology View LTV-R1, LTV-R3 Rainfall Gauge, LTV-W1/W2 Wind Sensor
[176] BlueLine Innovations Power Cost Monitor

4
conf/rtl_433.example.conf
View file

@ -348,7 +348,7 @@ convert si
protocol 119 # Bresser Weather Center 5-in-1
protocol 120 # Digitech XC-0324 / AmbientWeather FT005TH temp/hum sensor
protocol 121 # Opus/Imagintronix XT300 Soil Moisture
# protocol 122 # FS20
protocol 122 # FS20 / FHT
# protocol 123 # Jansite TPMS Model TY02S
protocol 124 # LaCrosse/ELV/Conrad WS7000/WS2500 weather sensors
protocol 125 # TS-FT002 Wireless Ultrasonic Tank Liquid Level Meter With Temperature Sensor
@ -399,7 +399,7 @@ convert si
protocol 170 # LaCrosse Technology View LTV-WR1 Multi Sensor
protocol 171 # LaCrosse Technology View LTV-TH Thermo/Hygro Sensor
protocol 172 # Bresser Weather Center 6-in-1, 7-in-1 indoor, soil, new 5-in-1, 3-in-1 wind gauge, Froggit WH6000, Ventus C8488A
protocol 173 # Bresser Weather Center 7-in-1, Air Quality PM2.5/PM10 7009970, CO2 7009977, HCHO/VOC 7009978
protocol 173 # Bresser Weather Center 7-in-1, Air Quality PM2.5/PM10 7009970, CO2 7009977, HCHO/VOC 7009978 sensors
protocol 174 # EcoDHOME Smart Socket and MCEE Solar monitor
protocol 175 # LaCrosse Technology View LTV-R1, LTV-R3 Rainfall Gauge, LTV-W1/W2 Wind Sensor
protocol 176 # BlueLine Innovations Power Cost Monitor

2
src/devices/bresser_7in1.c
View file

@ -275,7 +275,7 @@ static int bresser_7in1_decode(r_device *decoder, bitbuffer_t *bitbuffer)
/* clang-format off */
data = data_make(
"model", "", DATA_STRING, "Bresser-HCHO-VOC",
"model", "", DATA_STRING, "Bresser-HCHOVOC",
"id", "", DATA_INT, id,
"channel", "", DATA_INT, chan,
"startup", "Startup", DATA_COND, !nstartup, DATA_INT, !nstartup,

39
src/devices/fs20.c
View file

@ -10,7 +10,9 @@
(at your option) any later version.
*/
/**
#include "decoder.h"
/** @fn int fs20_decode(r_device *decoder, bitbuffer_t *bitbuffer)
Simple FS20 remote decoder.
Frequency: use rtl_433 -f 868.35M
@ -29,14 +31,12 @@ checksum and parity are not checked by this decoder.
Command extensions are also not decoded. feel free to improve!
*/
#include "decoder.h"
static int fs20_find_preamble(bitbuffer_t *bitbuffer, int bitpos)
{
// Preamble is 12 x '0' | '1', but we ignore the first preamble bit
// Last bit ('1') is at position (pattern[1] >> 4 & 1)
uint8_t const preamble_pattern[2] = {0x00, 0x10};
uint8_t const min_packet_length = 4 * (8 + 1);
uint8_t const min_packet_length = 4 * (8 + 1);
// fast scan for 8 consecutive '0' bits
uint8_t *bits = bitbuffer->bb[0];
@ -50,8 +50,9 @@ static int fs20_find_preamble(bitbuffer_t *bitbuffer, int bitpos)
}
while ((bitpos = bitbuffer_search(bitbuffer, 0, bitpos, preamble_pattern, 12)) < bitbuffer->bits_per_row[0]) {
if (bitpos + min_packet_length >= bitbuffer->bits_per_row[0])
if (bitpos + min_packet_length >= bitbuffer->bits_per_row[0]) {
return DECODE_ABORT_LENGTH;
}
return bitpos + 12;
}
@ -65,7 +66,7 @@ struct parity_byte {
uint8_t err;
};
static struct parity_byte get_byte(uint8_t* bits, unsigned pos)
static struct parity_byte get_byte(uint8_t *bits, unsigned pos)
{
uint16_t word = (bits[pos / 8] << 8) | bits[(pos / 8) + 1];
struct parity_byte res;
@ -166,13 +167,11 @@ static int fs20_decode(r_device *decoder, bitbuffer_t *bitbuffer)
uint16_t ad_b4 = 0;
uint32_t hc_b4 = 0;
int rc = DECODE_FAIL_MIC;
int rc = DECODE_FAIL_MIC;
int bitpos = 0;
while ((bitpos = fs20_find_preamble(bitbuffer, bitpos)) >= 0) {
if (decoder->verbose) {
fprintf(stderr, "Found preamble at %d\n", bitpos);
}
decoder_logf(decoder, 2, __func__, "Found preamble at %d", bitpos);
struct parity_byte res;
@ -212,15 +211,17 @@ static int fs20_decode(r_device *decoder, bitbuffer_t *bitbuffer)
sum = res.data;
rc = 1;
break;
break;
}
// propagate MIC
if (rc <= 0)
if (rc <= 0) {
return rc;
}
if (bitpos < 0)
if (bitpos < 0) {
return bitpos;
}
// Sum is (HC1 + HC2 + Addr + Cmd [+ Ext] + Type + Repeater-Hopcount
// Type is either 6 for regular FS20 devices (switches, dimmers, ...)
@ -231,8 +232,9 @@ static int fs20_decode(r_device *decoder, bitbuffer_t *bitbuffer)
sum -= cmd;
sum -= ext;
if ((sum < 6) || (sum > 0xC + 2))
return DECODE_FAIL_SANITY;
if ((sum < 6) || (sum > 0xC + 2)) {
return DECODE_FAIL_SANITY;
}
// convert address to fs20 format (base4+1)
for (uint8_t i = 0; i < 4; i++) {
@ -248,12 +250,14 @@ static int fs20_decode(r_device *decoder, bitbuffer_t *bitbuffer)
/* clang-format off */
data = data_make(
"model", "", DATA_STRING, (sum < 0xc) ? "FS20" : "FHT",
"model", "", DATA_COND, (sum < 0xc), DATA_STRING, "FS20",
"model", "", DATA_COND, !(sum < 0xc), DATA_STRING, "FHT",
"housecode", "", DATA_FORMAT, "%x", DATA_INT, hc_b4,
"address", "", DATA_FORMAT, "%x", DATA_INT, ad_b4,
"command", "", DATA_STRING, (sum < 0xc) ? cmd_tab[cmd & 0x1f] : fht_cmd_tab[cmd & 0xf],
"flags", "", DATA_STRING, (sum < 0xc) ? flags_tab[cmd >> 5] : fht_flags_tab[cmd >> 5],
"ext", "", DATA_FORMAT, "%x", DATA_INT, ext,
"mic", "Integrity", DATA_STRING, "PARITY",
NULL);
/* clang-format on */
decoder_output_data(decoder, data);
@ -272,12 +276,11 @@ static char const *const output_fields[] = {
};
r_device const fs20 = {
.name = "FS20",
.name = "FS20 / FHT",
.modulation = OOK_PULSE_PWM,
.short_width = 400,
.long_width = 600,
.reset_limit = 9000,
.decode_fn = &fs20_decode,
.disabled = 0,
.fields = output_fields,
};