Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/devices/lacrosse.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,11 @@ static int lacrossetx_decode(r_device *decoder, bitbuffer_t *bitbuffer)

// TODO: check if message length is a valid value
//uint8_t msg_len = msg_nybbles[1];
uint8_t msg_type = msg_nybbles[2];
uint8_t sensor_id = (msg_nybbles[3] << 3) + (msg_nybbles[4] >> 1);
float msg_value = msg_nybbles[5] * 10 + msg_nybbles[6] + msg_nybbles[7] * 0.1f;
int msg_value_int = msg_nybbles[8] * 10 + msg_nybbles[9];
uint8_t msg_type = msg_nybbles[2];
uint8_t sensor_id = (msg_nybbles[3] << 3) + (msg_nybbles[4] >> 1);
uint16_t msg_value_raw = (msg_nybbles[5] << 8) | (msg_nybbles[6] << 4) | msg_nybbles[7];
float msg_value = msg_nybbles[5] * 10 + msg_nybbles[6] + msg_nybbles[7] * 0.1f;
int msg_value_int = msg_nybbles[8] * 10 + msg_nybbles[9];

// Check Repeated data values as another way of verifying
// message integrity.
Expand Down Expand Up @@ -152,7 +153,7 @@ static int lacrossetx_decode(r_device *decoder, bitbuffer_t *bitbuffer)
data_t *data = data_make(
"model", "", DATA_STRING, "LaCrosse-TX",
"id", "", DATA_INT, sensor_id,
"humidity", "Humidity", DATA_FORMAT, "%.1f %%", DATA_DOUBLE, msg_value,
"humidity", "Humidity", DATA_COND, msg_value_raw != 0xff, DATA_FORMAT, "%.1f %%", DATA_DOUBLE, msg_value,
"mic", "Integrity", DATA_STRING, "PARITY",
NULL);
/* clang-format on */
Expand Down