mirror/DHT-sensor-library
1
0
Fork 0
mirror of https://github.com/adafruit/DHT-sensor-library.git synced 2023-10-23 22:20:38 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'jmdana-master'

Browse Source
This commit is contained in:
Tony DiCola 2015-10-05 17:55:14 -07:00
commit 5fb1668822
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
DHT.cpp
View File

@ -88,23 +88,17 @@ float DHT::readHumidity(bool force) {
//boolean isFahrenheit: True == Fahrenheit; False == Celcius //boolean isFahrenheit: True == Fahrenheit; False == Celcius
float DHT::computeHeatIndex(float temperature, float percentHumidity, bool isFahrenheit) { float DHT::computeHeatIndex(float temperature, float percentHumidity, bool isFahrenheit) {
// Adapted from equation at: https://github.com/adafruit/DHT-sensor-library/issues/9 and // Using both Rothfusz and Steadman's equations
// Wikipedia: http://en.wikipedia.org/wiki/Heat_index // http://www.wpc.ncep.noaa.gov/html/heatindex_equation.shtml
if (!isFahrenheit) { float hi;
// Celsius heat index calculation.
return -8.784695 + if (!isFahrenheit)
1.61139411 * temperature + temperature = convertCtoF(temperature);
2.338549 * percentHumidity +
-0.14611605 * temperature*percentHumidity + hi = 0.5 * (temperature + 61.0 + ((temperature - 68.0) * 1.2) + (percentHumidity * 0.094));
-0.01230809 * pow(temperature, 2) +
-0.01642482 * pow(percentHumidity, 2) + if (hi > 79) {
0.00221173 * pow(temperature, 2) * percentHumidity + hi = -42.379 +
0.00072546 * temperature*pow(percentHumidity, 2) +
-0.00000358 * pow(temperature, 2) * pow(percentHumidity, 2);
}
else {
// Fahrenheit heat index calculation.
return -42.379 +
2.04901523 * temperature + 2.04901523 * temperature +
10.14333127 * percentHumidity + 10.14333127 * percentHumidity +
-0.22475541 * temperature*percentHumidity + -0.22475541 * temperature*percentHumidity +
@ -113,7 +107,15 @@ float DHT::computeHeatIndex(float temperature, float percentHumidity, bool isFah
0.00122874 * pow(temperature, 2) * percentHumidity + 0.00122874 * pow(temperature, 2) * percentHumidity +
0.00085282 * temperature*pow(percentHumidity, 2) + 0.00085282 * temperature*pow(percentHumidity, 2) +
-0.00000199 * pow(temperature, 2) * pow(percentHumidity, 2); -0.00000199 * pow(temperature, 2) * pow(percentHumidity, 2);
if((percentHumidity < 13) && (temperature >= 80.0) && (temperature <= 112.0))
hi -= ((13.0 - percentHumidity) * 0.25) * sqrt((17.0 - abs(temperature - 95.0)) * 0.05882);
else if((percentHumidity > 85.0) && (temperature >= 80.0) && (temperature <= 87.0))
hi += ((percentHumidity - 85.0) * 0.1) * ((87.0 - temperature) * 0.2);
} }
return isFahrenheit ? hi : convertFtoC(hi);
} }
boolean DHT::read(bool force) { boolean DHT::read(bool force) {

2
library.properties
View File

@ -1,5 +1,5 @@
name=DHT sensor library name=DHT sensor library
version=1.2.0 version=1.2.1
author=Adafruit author=Adafruit
maintainer=Adafruit <info@adafruit.com> maintainer=Adafruit <info@adafruit.com>
sentence=Arduino library for DHT11, DHT22, etc Temp & Humidity Sensors sentence=Arduino library for DHT11, DHT22, etc Temp & Humidity Sensors