5 Commits
1.3.2 ... 1.3.3

3 changed files with 28 additions and 8 deletions

24
DHT.cpp
View File

@ -22,7 +22,9 @@ DHT::DHT(uint8_t pin, uint8_t type, uint8_t count) {
// based on the speed of the processor.
}
void DHT::begin(void) {
// Optionally pass pull-up time (in microseconds) before DHT reading starts.
// Default is 55 (see function declaration in DHT.h).
void DHT::begin(uint8_t usec) {
// set up the pins!
pinMode(_pin, INPUT_PULLUP);
// Using this value makes sure that millis() - lastreadtime will be
@ -30,6 +32,7 @@ void DHT::begin(void) {
// but so will the subtraction.
_lastreadtime = millis() - MIN_INTERVAL;
DEBUG_PRINT("DHT max clock cycles: "); DEBUG_PRINTLN(_maxcycles, DEC);
pullTime = usec;
}
//boolean S == Scale. True == Fahrenheit; False == Celcius
@ -39,6 +42,15 @@ float DHT::readTemperature(bool S, bool force) {
if (read(force)) {
switch (_type) {
case DHT11:
f = data[2];
if (data[3] & 0x80) {
f = -1 - f ;
}
f += (data[3] & 0x0f) * 0.1;
if(S) {
f = convertCtoF(f);
}
break;
case DHT12:
f = data[2];
f += (data[3] & 0x0f) * 0.1;
@ -155,11 +167,11 @@ bool DHT::read(bool force) {
pinMode(_pin, OUTPUT);
digitalWrite(_pin, LOW);
switch(_type) {
case DHT22:
case DHT21:
case DHT22:
case DHT21:
delayMicroseconds(1100); // data sheet says "at least 1ms"
break;
case DHT11:
case DHT11:
default:
delay(20); //data sheet says at least 18ms, 20ms just to be safe
break;
@ -170,8 +182,10 @@ bool DHT::read(bool force) {
// End the start signal by setting data line high for 40 microseconds.
pinMode(_pin, INPUT_PULLUP);
// Delay a moment to let sensor pull data line low.
delayMicroseconds(pullTime);
// Now start reading the data line to get the value from the DHT sensor.
delayMicroseconds(40); // Delay a bit to let sensor pull data line low.
// Turn off interrupts temporarily because the next sections
// are timing critical and we don't want any interruptions.

10
DHT.h
View File

@ -39,7 +39,7 @@ written by Adafruit Industries
class DHT {
public:
DHT(uint8_t pin, uint8_t type, uint8_t count=6);
void begin(void);
void begin(uint8_t usec=55);
float readTemperature(bool S=false, bool force=false);
float convertCtoF(float);
float convertFtoC(float);
@ -58,6 +58,7 @@ class DHT {
#endif
uint32_t _lastreadtime, _maxcycles;
bool _lastresult;
uint8_t pullTime; // Time (in usec) to pull up data line before reading
uint32_t expectPulse(bool level);
@ -66,6 +67,9 @@ class DHT {
class InterruptLock {
public:
InterruptLock() {
#if defined(ESP8266)
yield();
#endif
#if !defined(ARDUINO_ARCH_NRF52)
noInterrupts();
#endif
@ -73,9 +77,11 @@ class InterruptLock {
~InterruptLock() {
#if !defined(ARDUINO_ARCH_NRF52)
interrupts();
#endif
#if defined(ESP8266)
yield();
#endif
}
};
#endif

View File

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