Skip to content

Commit 2b8693e

Browse files
committed
minor: Remove Oregon-THGR810 humidity limits (closes #2996)
1 parent 696a008 commit 2b8693e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/devices/oregon_scientific.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ static int oregon_scientific_v3_decode(r_device *decoder, bitbuffer_t *bitbuffer
657657
float temp_c = get_os_temperature(msg);
658658
int humidity = get_os_humidity(msg);
659659
// Sanity check values
660-
if (temp_c > 70 || temp_c < -50 || humidity < 0 || humidity > 98) {
660+
if (temp_c > 70 || temp_c < -50) {
661661
decoder_logf(decoder, 1, __func__, "THGR810 Message failed values sanity check: temperature_C %.1fC humidity %d%%.", temp_c, humidity);
662662
return DECODE_FAIL_SANITY;
663663
}
@@ -772,12 +772,12 @@ static int oregon_scientific_v3_decode(r_device *decoder, bitbuffer_t *bitbuffer
772772
return DECODE_FAIL_SANITY;
773773
}
774774

775-
float gustWindspeed = (msg[5]&0x0f) /10.0F + ((msg[6]>>4)&0x0f) *1.0F + (msg[6]&0x0f) * 10.0F;
776-
float avgWindspeed = ((msg[7]>>4)&0x0f) / 10.0F + (msg[7]&0x0f) *1.0F + ((msg[8]>>4)&0x0f) * 10.0F;
777-
float quadrant = (0x0f&(msg[4]>>4))*22.5F;
775+
float gustWindspeed = (msg[5] & 0x0f) / 10.0f + ((msg[6] >> 4) & 0x0f) * 1.0f + (msg[6] & 0x0f) * 10.0f;
776+
float avgWindspeed = ((msg[7] >> 4) & 0x0f) / 10.0f + (msg[7] & 0x0f) * 1.0f + ((msg[8] >> 4) & 0x0f) * 10.0f;
777+
float quadrant = ((msg[4] >> 4) & 0x0f) * 22.5f;
778778

779779
// Sanity check values
780-
if (gustWindspeed < 0 || gustWindspeed > 56 || avgWindspeed < 0 || avgWindspeed > 56 || quadrant < 0 || quadrant > 337.5) {
780+
if (gustWindspeed < 0 || gustWindspeed > 56 || avgWindspeed < 0 || avgWindspeed > 56) {
781781
decoder_logf(decoder, 1, __func__, "WGR800 Message failed values sanity check: wind_max_m_s %.1f wind_avg_m_s %.1f wind_dir_deg %.1f.", gustWindspeed, avgWindspeed, quadrant);
782782
return DECODE_FAIL_SANITY;
783783
}

0 commit comments

Comments
 (0)