mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix latest DHT driver retries 

Fix latest DHT driver retries (#7717)
This commit is contained in:
Theo Arends 2020-02-16 12:33:18 +01:00
parent d76d6474cd
commit e7d5a5f540
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tasmota/xsns_06_dht_v5.ino
View File

@ -152,12 +152,7 @@ bool DhtRead(uint32_t sensor)
} }
break; break;
} }
if (temperature == NAN || humidity == NAN) { if (isnan(temperature) || isnan(humidity)) {
Dht[sensor].lastresult++;
if (Dht[sensor].lastresult > DHT_MAX_RETRY) { // Reset after 8 misses
Dht[sensor].t = NAN;
Dht[sensor].h = NAN;
}
AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "Invalid NAN reading")); AddLog_P(LOG_LEVEL_DEBUG, PSTR(D_LOG_DHT "Invalid NAN reading"));
return false; return false;
} }
@ -201,6 +196,7 @@ void DhtInit(void)
for (uint32_t i = 0; i < dht_sensors; i++) { for (uint32_t i = 0; i < dht_sensors; i++) {
pinMode(Dht[i].pin, INPUT_PULLUP); pinMode(Dht[i].pin, INPUT_PULLUP);
Dht[i].lastresult = DHT_MAX_RETRY; // Start with NAN
GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames); GetTextIndexed(Dht[i].stype, sizeof(Dht[i].stype), Dht[i].type, kSensorNames);
if (dht_sensors > 1) { if (dht_sensors > 1) {
snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin); snprintf_P(Dht[i].stype, sizeof(Dht[i].stype), PSTR("%s%c%02d"), Dht[i].stype, IndexSeparator(), Dht[i].pin);
@ -214,11 +210,16 @@ void DhtInit(void)
void DhtEverySecond(void) void DhtEverySecond(void)
{ {
if (uptime &1) { if (uptime &1) { // Every 2 seconds
} else { for (uint32_t sensor = 0; sensor < dht_sensors; sensor++) {
for (uint32_t i = 0; i < dht_sensors; i++) {
// DHT11 and AM2301 25mS per sensor, SI7021 5mS per sensor // DHT11 and AM2301 25mS per sensor, SI7021 5mS per sensor
DhtRead(i); if (!DhtRead(sensor)) {
Dht[sensor].lastresult++;
if (Dht[sensor].lastresult > DHT_MAX_RETRY) { // Reset after 8 misses
Dht[sensor].t = NAN;
Dht[sensor].h = NAN;
}
}
} }
} }
} }