Renamed to TFA-14.1504.V2 to accurately match the manufacturer's mode…

…l number
merbanan · Jan 3, 2023 · c8f21f4 · c8f21f4
1 parent 92cb5a0
commit c8f21f4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/include/rtl_433_devices.h b/include/rtl_433_devices.h
@@ -231,7 +231,7 @@
  DECL(fineoffset_wn34) \
  DECL(rubicson_pool_48942) \
  DECL(badger_orion) \
- DECL(tfa_14_1504) \
+ DECL(tfa_14_1504_v2) \
 
  /* Add new decoders here. */
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -203,7 +203,7 @@ add_library(r_433 STATIC
  devices/springfield.c
  devices/steelmate.c
  devices/telldus_ft0385r.c
- devices/tfa_14_1504.c
+ devices/tfa_14_1504_v2.c
  devices/tfa_30_3196.c
  devices/tfa_30_3221.c
  devices/tfa_drop_30.3233.c

diff --git a/src/devices/tfa_14_1504.c → src/devices/tfa_14_1504_v2.c b/src/devices/tfa_14_1504.c → src/devices/tfa_14_1504_v2.c
@@ -1,5 +1,5 @@
 /** @file
- Decoder for TFA Dostmann 14.1504 (TPX305)
+ Decoder for TFA Dostmann 14.1504.V2 (30.3254.01)
  Radio-controlled grill and meat thermometer
 
  Copyright (C) 2022-2023 Joël Bourquard <joel.bourquard@gmail.com>
@@ -11,7 +11,9 @@
 */
 
 /**
-Decoder for TFA Dostmann 14.1504 (TPX305)
+Decoder for TFA Dostmann 14.1504.V2 (30.3254.01)
+
+CAUTION: Do not confuse with TFA Dostmann 14.1504 (30.3201) which had a completely different protocol => [71] Maverick ET-732/733 BBQ Sensor
 
 Payload format:
 - Preamble {36} 0x7aaaaaa5c (for robustness we only use the tail: {24}0xaaaa5c)
@@ -22,7 +24,7 @@ Payload format:
 
 To get raw data:
 ```
-rtl_433 -R 0 -X 'n=TFA-14.1504,m=FSK_PCM,s=360,l=360,r=4096,preamble={24}aaaa5c'
+rtl_433 -R 0 -X 'n=TFA-14.1504.V2,m=FSK_PCM,s=360,l=360,r=4096,preamble={24}aaaa5c'
 ```
 
 Example payloads (excluding preamble):
@@ -47,7 +49,7 @@ Example payloads (excluding preamble):
 #define NUM_BITS_TOTAL (NUM_BITS_PREAMBLE + NUM_BITS_DATA)
 #define NUM_BITS_MAX (NUM_BITS_TOTAL + 12)
 
-static int tfa_14_1504_callback(r_device *decoder, bitbuffer_t *bitbuffer)
+static int tfa_14_1504_v2_callback(r_device *decoder, bitbuffer_t *bitbuffer)
 {
  uint8_t const preamble[] = {
  0xaa,
@@ -107,7 +109,7 @@ static int tfa_14_1504_callback(r_device *decoder, bitbuffer_t *bitbuffer)
 
  /* clang-format off */
  data_t *output = data_make(
- "model", "", DATA_STRING, "TFA-14.1504",
+ "model", "", DATA_STRING, "TFA-14.1504.V2",
  "battery_ok", "Battery", DATA_INT, battery_ok,
  "probe_fail", "Probe failure", DATA_INT, !is_probe_connected,
  "temperature_C", "Temperature", DATA_COND, is_probe_connected, DATA_FORMAT, "%.0f C", DATA_DOUBLE, temp_c,
@@ -128,12 +130,12 @@ static char *output_fields[] = {
  NULL,
 };
 
-r_device tfa_14_1504 = {
- .name = "TFA Dostmann 14.1504 Radio-controlled grill and meat thermometer",
+r_device tfa_14_1504_v2 = {
+ .name = "TFA Dostmann 14.1504.V2 Radio-controlled grill and meat thermometer",
  .modulation = FSK_PULSE_PCM,
  .short_width = 360,
  .long_width = 360,
  .reset_limit = 4096,
- .decode_fn = &tfa_14_1504_callback,
+ .decode_fn = &tfa_14_1504_v2_callback,
  .fields = output_fields,
 };