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

Fix computeHeatIndex declaration, check F_CPU in expectPulse

Browse Source
This commit is contained in:
Phillip Burgess 2019-01-11 16:47:34 -08:00
parent 07da1cd001
commit bdd2756ed1
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DHT.cpp
View File

@ -92,13 +92,15 @@ float DHT::readHumidity(bool force) {
} }
//boolean isFahrenheit: True == Fahrenheit; False == Celcius //boolean isFahrenheit: True == Fahrenheit; False == Celcius
float DHT::computeHeatIndex(isFahrenheit) { float DHT::computeHeatIndex(bool isFahrenheit) {
float hi = self.computeHeatIndex(self.readTemperature(isFahrenheit), self.readHumidity(), isFahrenheit); float hi = computeHeatIndex(readTemperature(isFahrenheit), readHumidity(),
isFahrenheit);
return isFahrenheit ? hi : convertFtoC(hi); return isFahrenheit ? hi : convertFtoC(hi);
} }
//boolean isFahrenheit: True == Fahrenheit; False == Celcius //boolean isFahrenheit: True == Fahrenheit; False == Celcius
float DHT::computeHeatIndex(float temperature, floast percentHumidity, bool isFahrenheit) { float DHT::computeHeatIndex(float temperature, float percentHumidity,
bool isFahrenheit) {
// Using both Rothfusz and Steadman's equations // Using both Rothfusz and Steadman's equations
// http://www.wpc.ncep.noaa.gov/html/heatindex_equation.shtml // http://www.wpc.ncep.noaa.gov/html/heatindex_equation.shtml
float hi; float hi;
@ -243,7 +245,11 @@ bool DHT::read(bool force) {
// in the very latest IDE versions): // in the very latest IDE versions):
// https://github.com/arduino/Arduino/blob/master/hardware/arduino/avr/cores/arduino/wiring_pulse.c // https://github.com/arduino/Arduino/blob/master/hardware/arduino/avr/cores/arduino/wiring_pulse.c
uint32_t DHT::expectPulse(bool level) { uint32_t DHT::expectPulse(bool level) {
uint16_t count = 0; #if (F_CPU > 16000000L)
uint32_t count = 0;
#else
uint16_t count = 0; // To work fast enough on slower AVR boards
#endif
// On AVR platforms use direct GPIO port access as it's much faster and better // On AVR platforms use direct GPIO port access as it's much faster and better
// for catching pulses that are 10's of microseconds in length: // for catching pulses that are 10's of microseconds in length:
#ifdef __AVR #ifdef __AVR