MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix setting of invalid temp/hum on bad gpio read. 

Return temp, hum tuple from read function.
This commit is contained in:
Pat Wood 2015-06-26 01:00:01 -04:00
parent 8e31b30065
commit acc7f70410
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/modules/dht.c
View File

@ -71,7 +71,7 @@ static bool DHTRead(int pin, DHT_TYPE type)
if(i == DHT_MAXCOUNT) if(i == DHT_MAXCOUNT)
{ {
DHT_DEBUG("DHT: Failed to get reading from GPIO%d, dying\r\n", pin); DHT_DEBUG("DHT: Failed to get reading from GPIO%d, dying\r\n", pin);
temp = hum = -1; temp = hum = -10000;
return false; return false;
} }
@ -123,13 +123,13 @@ static bool DHTRead(int pin, DHT_TYPE type)
else { else {
DHT_DEBUG("DHT: Checksum was incorrect after %d bits. Expected %d but got %d (GPIO%d)\r\n", DHT_DEBUG("DHT: Checksum was incorrect after %d bits. Expected %d but got %d (GPIO%d)\r\n",
j, data[4], checksum, pin); j, data[4], checksum, pin);
temp = hum = -1; temp = hum = -10000;
return false; return false;
} }
} }
else { else {
DHT_DEBUG("DHT: Got too few bits: %d should be at least 40 (GPIO%d)\r\n", j, pin); DHT_DEBUG("DHT: Got too few bits: %d should be at least 40 (GPIO%d)\r\n", j, pin);
temp = hum = -1; temp = hum = -10000;
return false; return false;
} }
return true; return true;
@ -139,10 +139,12 @@ static bool DHTRead(int pin, DHT_TYPE type)
static int dht_read11(lua_State *L) static int dht_read11(lua_State *L)
{ {
unsigned pin = luaL_checkinteger(L, 1); unsigned pin = luaL_checkinteger(L, 1);
if (DHTRead(pin, DHT11)) if (DHTRead(pin, DHT11)) {
lua_pushinteger(L, 1); lua_pushinteger(L, temp);
else lua_pushinteger(L, hum);
lua_pushinteger(L, 0); return 2;
}
lua_pushnil(L);
return 1; return 1;
} }
@ -150,10 +152,12 @@ static int dht_read11(lua_State *L)
static int dht_read22(lua_State *L) static int dht_read22(lua_State *L)
{ {
unsigned pin = luaL_checkinteger(L, 1); unsigned pin = luaL_checkinteger(L, 1);
if (DHTRead(pin, DHT22)) if (DHTRead(pin, DHT22)) {
lua_pushinteger(L, 1); lua_pushinteger(L, temp);
else lua_pushinteger(L, hum);
lua_pushinteger(L, 0); return 2;
}
lua_pushnil(L);
return 1; return 1;
} }