Add some compatible sensor descriptions

This commit is contained in:
Christian W. Zuckschwerdt 2020-01-25 12:12:29 +01:00
parent 51d47ce66f
commit a3ae65d6ac
6 changed files with 60 additions and 52 deletions

View file

@ -84,7 +84,7 @@ Read the Test Data section at the bottom.
= Supported device protocols =
[01] Silvercrest Remote Control
[02] Rubicson Temperature Sensor
[03] Prologue Temperature Sensor
[03] Prologue, FreeTec NC-7104, NC-7159-675 temperature sensor
[04] Waveman Switch Transmitter
[06]* ELV EM 1000
[07]* ELV WS 2000
@ -124,7 +124,7 @@ Read the Test Data section at the bottom.
[44] CurrentCost Current Sensor
[45] emonTx OpenEnergyMonitor
[46] HT680 Remote control
[47] Conrad S3318P Temperature & Humidity Sensor
[47] Conrad S3318P, FreeTec NC-5849-913 temperature humidity sensor
[48] Akhan 100F14 remote keyless entry
[49] Quhwa
[50] OSv1 Temperature Sensor
@ -160,13 +160,13 @@ Read the Test Data section at the bottom.
[82] Citroen TPMS
[83] Oil Ultrasonic STANDARD ASK
[84] Thermopro TP11 Thermometer
[85] Solight TE44
[85] Solight TE44/TE66, EMOS E0107T, NX-6876-917
[86] Wireless Smoke and Heat Detector GS 558
[87] Generic wireless motion sensor
[88] Toyota TPMS
[89] Ford TPMS
[90] Renault TPMS
[91] inFactory
[91] inFactory, FreeTec NC-3982-913 temperature humidity sensor
[92] FT-004-B Temperature Sensor
[93] Ford Car Key
[94] Philips outdoor temperature sensor (type AJ3650)
@ -180,7 +180,7 @@ Read the Test Data section at the bottom.
[102] SimpliSafe Home Security System (May require disabling automatic gain for KeyPad decodes)
[103] Sensible Living Mini-Plant Moisture Sensor
[104] Wireless M-Bus, Mode C&T, 100kbps (-f 868950000 -s 1200000)
[105]* Wireless M-Bus, Mode S, 32.768kbps (-f 868300000 -s 1000000)
[105] Wireless M-Bus, Mode S, 32.768kbps (-f 868300000 -s 1000000)
[106]* Wireless M-Bus, Mode R, 4.8kbps (-f 868330000)
[107]* Wireless M-Bus, Mode F, 2.4kbps
[108] Hyundai WS SENZOR Remote Temperature Sensor

View file

@ -153,7 +153,7 @@ Silvercrest Remote Control
Rubicson Temperature Sensor
.TP
[ \fB03\fI\fP ]
Prologue Temperature Sensor
Prologue, FreeTec NC\-7104, NC\-7159\-675 temperature sensor
.TP
[ \fB04\fI\fP ]
Waveman Switch Transmitter
@ -273,7 +273,7 @@ emonTx OpenEnergyMonitor
HT680 Remote control
.TP
[ \fB47\fI\fP ]
Conrad S3318P Temperature & Humidity Sensor
Conrad S3318P, FreeTec NC\-5849\-913 temperature humidity sensor
.TP
[ \fB48\fI\fP ]
Akhan 100F14 remote keyless entry
@ -381,7 +381,7 @@ Oil Ultrasonic STANDARD ASK
Thermopro TP11 Thermometer
.TP
[ \fB85\fI\fP ]
Solight TE44
Solight TE44/TE66, EMOS E0107T, NX\-6876\-917
.TP
[ \fB86\fI\fP ]
Wireless Smoke and Heat Detector GS 558
@ -399,7 +399,7 @@ Ford TPMS
Renault TPMS
.TP
[ \fB91\fI\fP ]
inFactory
inFactory, FreeTec NC\-3982\-913 temperature humidity sensor
.TP
[ \fB92\fI\fP ]
FT\-004\-B Temperature Sensor
@ -441,7 +441,7 @@ Sensible Living Mini\-Plant Moisture Sensor
Wireless M\-Bus, Mode C&T, 100kbps (\-f 868950000 \-s 1200000)
.TP
[ \fB105\fI\fP ]
* Wireless M\-Bus, Mode S, 32.768kbps (\-f 868300000 \-s 1000000)
Wireless M\-Bus, Mode S, 32.768kbps (\-f 868300000 \-s 1000000)
.TP
[ \fB106\fI\fP ]
* Wireless M\-Bus, Mode R, 4.8kbps (\-f 868330000)

View file

@ -7,9 +7,13 @@
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
*/
/**
inFactory Outdoor sensor transmits data temperature, humidity.
Also NC-3982-913 from Pearl (for FWS-686 station).
Transmissions also includes an id. The sensor transmits
every 60 seconds 6 packets.
@ -92,7 +96,7 @@ static char *output_fields[] = {
};
r_device infactory = {
.name = "inFactory",
.name = "inFactory, FreeTec NC-3982-913 temperature humidity sensor",
.modulation = OOK_PULSE_PPM,
.short_width = 1850,
.long_width = 4050,

View file

@ -109,7 +109,7 @@ static char *output_fields[] = {
NULL};
r_device prologue = {
.name = "Prologue Temperature Sensor",
.name = "Prologue, FreeTec NC-7104, NC-7159-675 temperature sensor",
.modulation = OOK_PULSE_PPM,
.short_width = 2000,
.long_width = 4000,

View file

@ -13,6 +13,8 @@
Largely the same as esperanza_ews, kedsum.
\sa esperanza_ews.c kedsum.c
Also NC-5849-913 from Pearl (for FWS-310 station).
Transmit Interval: every ~50s.
Message Format: 40 bits (10 nibbles).
@ -111,11 +113,11 @@ static char *output_fields[] = {
"temperature_F",
"humidity",
"mic",
NULL
NULL,
};
r_device s3318p = {
.name = "Conrad S3318P Temperature & Humidity Sensor",
.name = "Conrad S3318P, FreeTec NC-5849-913 temperature humidity sensor",
.modulation = OOK_PULSE_PPM,
.short_width = 1900,
.long_width = 3800,
@ -123,5 +125,5 @@ r_device s3318p = {
.reset_limit = 9400,
.decode_fn = &s3318p_callback,
.disabled = 0,
.fields = output_fields
.fields = output_fields,
};

View file

@ -1,38 +1,40 @@
/* Solight TE44
*
* Generic wireless thermometer of chinese provenience, which might be sold as part of different kits.
*
* So far these were identified (mostly sold in central/eastern europe)
* - Solight TE44
* - Solight TE66
* - EMOS E0107T
*
* Rated -50 C to 70 C, frequency 433,92 MHz, three selectable channels.
*
* ---------------------------------------------------------------------------------------------
*
* Data structure:
*
* 12 repetitions of the same 36 bit payload, 1bit zero as a separator between each repetition.
*
* 36 bit payload format: xxxxxxxx 10ccmmmm tttttttt 1111hhhh hhhh
*
* x - random key - changes after device reset - 8 bits
* c - channel (0-2) - 2 bits
* m - multiplier - signed integer, two's complement - 4 bits
* t - temperature in celsius - unsigned integer - 8 bits
* h - checksum - 8 bits
*
* Temperature in C = ((256 * m) + t) / 10
*
* ----------------------------------------------------------------------------------------------
*
* Copyright (C) 2017 Miroslav Oujesky
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*/
/** @file
Solight TE44 temperature sensor.
Copyright (C) 2017 Miroslav Oujesky
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
*/
/** @fn int solight_te44_callback(r_device *decoder, bitbuffer_t *bitbuffer)
Solight TE44 -- Generic wireless thermometer, which might be sold as part of different kits.
So far these were identified (mostly sold in central/eastern europe)
- Solight TE44
- Solight TE66
- EMOS E0107T
- NX-6876-917 from Pearl (for FWS-70 station).
Rated -50 C to 70 C, frequency 433,92 MHz, three selectable channels.
Data structure:
12 repetitions of the same 36 bit payload, 1bit zero as a separator between each repetition.
36 bit payload format: xxxxxxxx 10ccmmmm tttttttt 1111hhhh hhhh
- x: random key - changes after device reset - 8 bits
- c: channel (0-2) - 2 bits
- m: multiplier - signed integer, two's complement - 4 bits
- t: temperature in celsius - unsigned integer - 8 bits
- h: checksum - 8 bits
Temperature in C = ((256 * m) + t) / 10
*/
#include "decoder.h"
@ -89,11 +91,11 @@ static char *output_fields[] = {
"id",
"channel",
"temperature_C",
NULL
NULL,
};
r_device solight_te44 = {
.name = "Solight TE44",
.name = "Solight TE44/TE66, EMOS E0107T, NX-6876-917",
.modulation = OOK_PULSE_PPM,
.short_width = 972, // short gap = 972 us
.long_width = 1932, // long gap = 1932 us