Add Acurite 590TX support (#1411)
This commit is contained in:
parent
e64d3e5f7b
commit
0334a966fb
2 changed files with 134 additions and 1 deletions
|
@ -170,7 +170,7 @@
|
||||||
DECL(idm) \
|
DECL(idm) \
|
||||||
DECL(netidm) \
|
DECL(netidm) \
|
||||||
DECL(thermopro_tx2) \
|
DECL(thermopro_tx2) \
|
||||||
|
DECL(acurite_590tx) \
|
||||||
/* Add new decoders here. */
|
/* Add new decoders here. */
|
||||||
|
|
||||||
#define DECL(name) extern r_device name;
|
#define DECL(name) extern r_device name;
|
||||||
|
|
|
@ -868,6 +868,111 @@ static int acurite_606_decode(r_device *decoder, bitbuffer_t *bitbuffer)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
static int acurite_590tx_decode(r_device *decoder, bitbuffer_t *bitbuffer)
|
||||||
|
{
|
||||||
|
data_t *data;
|
||||||
|
uint8_t *b;
|
||||||
|
int row;
|
||||||
|
uint8_t channel,humidity;
|
||||||
|
int16_t temp_raw; // temperature as read from the data packet
|
||||||
|
float temp_c; // temperature in C
|
||||||
|
int battery; // the battery status: 1 is good, 0 is low
|
||||||
|
int sensor_id; // the sensor ID - basically a random number that gets reset whenever the battery is removed
|
||||||
|
|
||||||
|
|
||||||
|
if (decoder->verbose >1)
|
||||||
|
bitbuffer_printf(bitbuffer, "%s: ", __func__);
|
||||||
|
|
||||||
|
row = bitbuffer_find_repeated_row(bitbuffer, 3, 25); // expected are min 3 rows
|
||||||
|
if (row < 0)
|
||||||
|
return DECODE_ABORT_EARLY;
|
||||||
|
|
||||||
|
if (decoder->verbose > 1)
|
||||||
|
bitbuffer_printf(bitbuffer, "%s: ", __func__);
|
||||||
|
|
||||||
|
if (bitbuffer->bits_per_row[row] > 25)
|
||||||
|
return DECODE_ABORT_LENGTH;
|
||||||
|
|
||||||
|
b = bitbuffer->bb[row];
|
||||||
|
|
||||||
|
if (b[4] != 0) //last byte should be zero
|
||||||
|
return DECODE_FAIL_SANITY;
|
||||||
|
|
||||||
|
// reject all blank messages
|
||||||
|
if (b[0] == 0 && b[1] == 0 && b[2] == 0 && b[3] == 0)
|
||||||
|
return DECODE_FAIL_SANITY;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// parity check: odd parity on bits [0 .. 10]
|
||||||
|
// i.e. 8 bytes and another 2 bits.
|
||||||
|
uint8_t parity = b[0]; // parity as byte
|
||||||
|
parity = (parity >> 4) ^ (parity & 0xF); // fold to nibble
|
||||||
|
parity = (parity >> 2) ^ (parity & 0x3); // fold to 2 bits
|
||||||
|
parity ^= b[1] >> 6; // add remaining bits
|
||||||
|
parity = (parity >> 1) ^ (parity & 0x1); // fold to 1 bit
|
||||||
|
|
||||||
|
if (!parity) {
|
||||||
|
//Enable with -vv (verbose decoders)
|
||||||
|
if (decoder->verbose) {
|
||||||
|
fprintf(stderr, "%s: parity check failed\n", __func__);
|
||||||
|
}
|
||||||
|
return DECODE_FAIL_MIC;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Processing the temperature:
|
||||||
|
// Upper 4 bits are stored in nibble 1, lower 8 bits are stored in nibble 2
|
||||||
|
// upper 4 bits of nibble 1 are reserved for other usages (e.g. battery status)
|
||||||
|
sensor_id = b[0] & 0xFE; //first 6 bits and it changes each time it resets or change the battery
|
||||||
|
battery = (b[0] & 0x01); //1=ok, 0=low battery
|
||||||
|
//next 2 bits are checksum
|
||||||
|
//next two bits are identify ID (maybe channel ?)
|
||||||
|
channel = (uint8_t)((b[1]>>4) & 0x03);
|
||||||
|
if ( (b[1] & 0x0F)==0 && b[2]<=100) //MFD: I see no other way to diferentiate humidity from temperature
|
||||||
|
{
|
||||||
|
humidity = b[2];
|
||||||
|
/* clang-format off */
|
||||||
|
data = data_make(
|
||||||
|
"model", "", DATA_STRING, "Acurite-590TX",
|
||||||
|
"id", "", DATA_INT, sensor_id,
|
||||||
|
"batttery", "Battery", DATA_STRING, battery ? "OK" : "LOW",
|
||||||
|
"battery_ok", "Battery OK", DATA_INT, battery,
|
||||||
|
"channel", "Channel", DATA_INT, channel,
|
||||||
|
"humidity", "Humidity", DATA_INT, humidity,
|
||||||
|
"mic", "Integrity", DATA_STRING, "PARITY",
|
||||||
|
NULL);
|
||||||
|
/* clang-format on */
|
||||||
|
|
||||||
|
}else
|
||||||
|
{
|
||||||
|
|
||||||
|
temp_raw = (int16_t)( ((b[1] &0x0F) << 12) | (b[2] << 4));
|
||||||
|
temp_raw = temp_raw >> 4;
|
||||||
|
temp_c = temp_raw * 0.1f - 50; //MFD: seems to be a 50 degree offset maybe to be able to go negative
|
||||||
|
|
||||||
|
/* clang-format off */
|
||||||
|
data = data_make(
|
||||||
|
"model", "", DATA_STRING, "Acurite-590TX",
|
||||||
|
"id", "", DATA_INT, sensor_id,
|
||||||
|
"batttery", "Battery", DATA_STRING, battery ? "OK" : "LOW",
|
||||||
|
"battery_ok", "Battery OK", DATA_INT, battery,
|
||||||
|
"channel", "Channel", DATA_INT, channel,
|
||||||
|
"temperature_C", "Temperature C", DATA_FORMAT, "%.1f", DATA_DOUBLE, temp_c,
|
||||||
|
//"temperature_F", "Temperature F", DATA_FORMAT, "%.1f", DATA_DOUBLE, temp_c*1.8+32,
|
||||||
|
"mic", "Integrity", DATA_STRING, "PARITY",
|
||||||
|
NULL);
|
||||||
|
/* clang-format on */
|
||||||
|
}
|
||||||
|
|
||||||
|
decoder_output_data(decoder, data);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static int acurite_00275rm_decode(r_device *decoder, bitbuffer_t *bitbuffer)
|
static int acurite_00275rm_decode(r_device *decoder, bitbuffer_t *bitbuffer)
|
||||||
{
|
{
|
||||||
int crc, battery_low, id, model_flag, valid = 0;
|
int crc, battery_low, id, model_flag, valid = 0;
|
||||||
|
@ -1112,6 +1217,20 @@ static char *acurite_606_output_fields[] = {
|
||||||
NULL,
|
NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
static char *acurite_590_output_fields[] = {
|
||||||
|
"model",
|
||||||
|
"id",
|
||||||
|
"batttery",
|
||||||
|
"channel",
|
||||||
|
"temperature_C",
|
||||||
|
//"temperature_F",
|
||||||
|
"humidity",
|
||||||
|
"mic",
|
||||||
|
NULL,
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
r_device acurite_606 = {
|
r_device acurite_606 = {
|
||||||
.name = "Acurite 606TX Temperature Sensor",
|
.name = "Acurite 606TX Temperature Sensor",
|
||||||
// actually tests/acurite/02/gfile002.cu8, check this
|
// actually tests/acurite/02/gfile002.cu8, check this
|
||||||
|
@ -1159,3 +1278,17 @@ r_device acurite_00275rm = {
|
||||||
.disabled = 0,
|
.disabled = 0,
|
||||||
.fields = acurite_00275rm_output_fields,
|
.fields = acurite_00275rm_output_fields,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
r_device acurite_590tx = {
|
||||||
|
.name = "Acurite 590TX Temperature with optional Humidity",
|
||||||
|
.modulation = OOK_PULSE_PPM, //OOK_PULSE_PWM,
|
||||||
|
.short_width = 500, // short pulse is 232 us
|
||||||
|
.long_width = 1500, // long pulse is 420 us
|
||||||
|
.gap_limit = 1484, // long gap is 384 us, sync gap is 592 us
|
||||||
|
.reset_limit = 3000, // no packet gap, sync gap is 592 us
|
||||||
|
.sync_width = 500, // sync pulse is 632 us
|
||||||
|
.decode_fn = &acurite_590tx_decode,
|
||||||
|
.disabled = 0,
|
||||||
|
.fields = acurite_590_output_fields,
|
||||||
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue