From 0ae39cc5f2fcae147f8fbe8ec81669267a183ccc Mon Sep 17 00:00:00 2001 From: "Christian W. Zuckschwerdt" Date: Sun, 28 Jan 2024 11:13:41 +0100 Subject: [PATCH] minor: Add Acurite-515 note to Acurite-TXR (closes #2805) --- README.md | 4 ++-- conf/rtl_433.example.conf | 4 ++-- src/devices/acurite.c | 8 ++++---- src/devices/nexus.c | 3 ++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 7d473f67..d0162074 100644 --- a/README.md +++ b/README.md @@ -127,7 +127,7 @@ See [CONTRIBUTING.md](./docs/CONTRIBUTING.md). [37]* Inovalley kw9015b, TFA Dostmann 30.3161 (Rain and temperature sensor) [38] Generic temperature sensor 1 [39] WG-PB12V1 Temperature Sensor - [40] Acurite 592TXR Temp/Humidity, 592TX Temp, 5n1 Weather Station, 6045 Lightning, 899 Rain, 3N1, Atlas + [40] Acurite 592TXR temp/humidity, 592TX temp, 5n1, 3n1, Atlas weather station, 515 fridge/freezer, 6045 lightning, 899 rain, 1190/1192 leak [41] Acurite 986 Refrigerator / Freezer Thermometer [42] HIDEKI TS04 Temperature, Humidity, Wind and Rain Sensor [43] Watchman Sonic / Apollo Ultrasonic / Beckett Rocket oil tank monitor @@ -198,7 +198,7 @@ See [CONTRIBUTING.md](./docs/CONTRIBUTING.md). [110] PMV-107J (Toyota) TPMS [111] Emos TTX201 Temperature Sensor [112] Ambient Weather TX-8300 Temperature/Humidity Sensor - [113] Ambient Weather WH31E Thermo-Hygrometer Sensor, EcoWitt WH40 rain gauge, EcoWitt WS68 weather station + [113] Ambient Weather WH31E Thermo-Hygrometer Sensor, EcoWitt WH40 rain gauge, WS68 weather station [114] Maverick et73 [115] Honeywell ActivLink, Wireless Doorbell [116] Honeywell ActivLink, Wireless Doorbell (FSK) diff --git a/conf/rtl_433.example.conf b/conf/rtl_433.example.conf index 4e203b6f..7a348851 100644 --- a/conf/rtl_433.example.conf +++ b/conf/rtl_433.example.conf @@ -268,7 +268,7 @@ convert si # protocol 37 # Inovalley kw9015b, TFA Dostmann 30.3161 (Rain and temperature sensor) protocol 38 # Generic temperature sensor 1 protocol 39 # WG-PB12V1 Temperature Sensor - protocol 40 # Acurite 592TXR Temp/Humidity, 592TX Temp, 5n1 Weather Station, 6045 Lightning, 899 Rain, 3N1, Atlas + protocol 40 # Acurite 592TXR temp/humidity, 592TX temp, 5n1, 3n1, Atlas weather station, 515 fridge/freezer, 6045 lightning, 899 rain, 1190/1192 leak protocol 41 # Acurite 986 Refrigerator / Freezer Thermometer protocol 42 # HIDEKI TS04 Temperature, Humidity, Wind and Rain Sensor protocol 43 # Watchman Sonic / Apollo Ultrasonic / Beckett Rocket oil tank monitor @@ -339,7 +339,7 @@ convert si protocol 110 # PMV-107J (Toyota) TPMS protocol 111 # Emos TTX201 Temperature Sensor protocol 112 # Ambient Weather TX-8300 Temperature/Humidity Sensor - protocol 113 # Ambient Weather WH31E Thermo-Hygrometer Sensor, EcoWitt WH40 rain gauge + protocol 113 # Ambient Weather WH31E Thermo-Hygrometer Sensor, EcoWitt WH40 rain gauge, WS68 weather station protocol 114 # Maverick et73 protocol 115 # Honeywell ActivLink, Wireless Doorbell protocol 116 # Honeywell ActivLink, Wireless Doorbell (FSK) diff --git a/src/devices/acurite.c b/src/devices/acurite.c index 7334e61c..4469da51 100644 --- a/src/devices/acurite.c +++ b/src/devices/acurite.c @@ -1259,7 +1259,7 @@ Process messages for Acurite weather stations, tower and related sensors @sa acurite_515_decode() @sa acurite_6045_decode() @sa acurite_899_decode() -#sa acurite_3n1_decode() +@sa acurite_3n1_decode() @sa acurite_5n1_decode() @sa acurite_atlas_decode() @sa acurite_tower_decode() @@ -1279,7 +1279,7 @@ These devices have a message type in the 3rd byte and an 8 bit checksum in the last byte. */ -static int acurite_txr_callback(r_device *decoder, bitbuffer_t *bitbuffer) +static int acurite_txr_decode(r_device *decoder, bitbuffer_t *bitbuffer) { int decoded = 0; int error_ret = 0; @@ -1949,14 +1949,14 @@ static char const *const acurite_txr_output_fields[] = { }; r_device const acurite_txr = { - .name = "Acurite 592TXR Temp/Humidity, 592TX Temp, 5n1 Weather Station, 6045 Lightning, 899 Rain, 3N1, Atlas", + .name = "Acurite 592TXR temp/humidity, 592TX temp, 5n1, 3n1, Atlas weather station, 515 fridge/freezer, 6045 lightning, 899 rain, 1190/1192 leak", .modulation = OOK_PULSE_PWM, .short_width = 220, // short pulse is 220 us + 392 us gap .long_width = 408, // long pulse is 408 us + 204 us gap .sync_width = 620, // sync pulse is 620 us + 596 us gap .gap_limit = 500, // longest data gap is 392 us, sync gap is 596 us .reset_limit = 4000, // packet gap is 2192 us - .decode_fn = &acurite_txr_callback, + .decode_fn = &acurite_txr_decode, .fields = acurite_txr_output_fields, }; diff --git a/src/devices/nexus.c b/src/devices/nexus.c index 08dad37d..e321d73a 100644 --- a/src/devices/nexus.c +++ b/src/devices/nexus.c @@ -13,7 +13,8 @@ Nexus sensor protocol with ID, temperature and optional humidity also FreeTec (Pearl) NC-7345 sensors for FreeTec Weatherstation NC-7344, also infactory/FreeTec (Pearl) NX-3980 sensors for infactory/FreeTec NX-3974 station, also Solight TE82S sensors for Solight TE76/TE82/TE83/TE84 stations, -also TFA 30.3209.02 temperature/humidity sensor. +also TFA 30.3209.02 temperature/humidity sensor, +also Unmarked sensor form Rossmann Poland, board markings XS1043 REV02. The sensor sends 36 bits 12 times, the packets are ppm modulated (distance coding) with a pulse of ~500 us