Skip to content

Commit

Permalink
DHT plugin update (#736)
Browse files Browse the repository at this point in the history 
Modification of DHT plugin to use Sonoff am2301 and si7021 sensors.
Also correct some NAN readings.
  • Loading branch information
@jctual @psy0rz
jctual authored and psy0rz committed Jan 19, 2018
1 parent 5f89698 commit c0c6536
Showing 1 changed file with 99 additions and 83 deletions.
182 changes: 99 additions & 83 deletions src/_P005_DHT.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#define PLUGIN_005
#define PLUGIN_ID_005 5
#define PLUGIN_NAME_005 "Environment - DHT11/12/22"
#define PLUGIN_NAME_005 "Environment - DHT11/12/22 SONOFF2301/7021"
#define PLUGIN_VALUENAME1_005 "Temperature"
#define PLUGIN_VALUENAME2_005 "Humidity"

Expand Down Expand Up @@ -47,10 +47,10 @@ boolean Plugin_005(byte function, struct EventStruct *event, String& string)

case PLUGIN_WEBFORM_LOAD:
{
const String options[] = { F("DHT 11"), F("DHT 22"), F("DHT 12") };
int indices[] = { 11, 22, 12 };
const String options[] = { F("DHT 11"), F("DHT 22"), F("DHT 12"), F("Sonoff am2301"), F("Sonoff si7021") };
int indices[] = { 11, 22, 12, 23, 70 };

addFormSelector(string, F("DHT Type"), F("plugin_005_dhttype"), 3, options, indices, Settings.TaskDevicePluginConfig[event->TaskIndex][0] );
addFormSelector(string, F("DHT Type"), F("plugin_005_dhttype"), 5, options, indices, Settings.TaskDevicePluginConfig[event->TaskIndex][0] );

success = true;
break;
Expand All @@ -67,103 +67,123 @@ boolean Plugin_005(byte function, struct EventStruct *event, String& string)
case PLUGIN_READ:
{
byte dht_dat[5];
byte dht_in;
byte i;
// byte Retry = 0;
boolean error = false;

byte Par3 = Settings.TaskDevicePluginConfig[event->TaskIndex][0];
Plugin_005_DHT_Pin = Settings.TaskDevicePin1[event->TaskIndex];

pinMode(Plugin_005_DHT_Pin, OUTPUT);
// DHT start condition, pull-down i/o pin for 18ms
digitalWrite(Plugin_005_DHT_Pin, LOW); // Pull low
delay(18);
digitalWrite(Plugin_005_DHT_Pin, HIGH); // Pull high
delayMicroseconds(20); // was 40
if(Par3 == 11 || Par3 == 22 || Par3 == 12) delay(18);
else if (Par3 == 23 ) delayMicroseconds(900);
else if (Par3 == 70 ) delayMicroseconds(500);
pinMode(Plugin_005_DHT_Pin, INPUT); // change pin to input
delayMicroseconds(10);
delayMicroseconds(50);

dht_in = digitalRead(Plugin_005_DHT_Pin);
if (!dht_in)
error = waitState(0);
if(error)
{ logError(event, F("DHT : no Reading !"));
break;
}
error = waitState(1);
if(error)
{ logError(event, F("DHT : no Reading !"));
break;
}
noInterrupts();
error = waitState(0);
if(error)
{ logError(event, F("DHT : no Reading !"));
break;
}
for (i = 0; i < 5; i++)
{
delayMicroseconds(80);
dht_in = digitalRead(Plugin_005_DHT_Pin);
if (dht_in)
{
delayMicroseconds(80); // now ready for data reception
for (i = 0; i < 5; i++)
{
byte data = Plugin_005_read_dht_dat();
if (data != -1)
dht_dat[i] = data;
else
{
addLog(LOG_LEVEL_ERROR, F("DHT : protocol timeout!"));
error = true;
}
byte data = Plugin_005_read_dht_dat();
if(data == -1)
{ logError(event, "DHT : protocol timeout!");
break;
}

if (!error)
{
dht_dat[i] = data;
}
interrupts();

// Checksum calculation is a Rollover Checksum by design!
byte dht_check_sum = dht_dat[0] + dht_dat[1] + dht_dat[2] + dht_dat[3]; // check check_sum

if (dht_dat[4] == dht_check_sum)
{
float temperature = NAN;
float humidity = NAN;

if (Par3 == 11)
{
temperature = float(dht_dat[2]); // Temperature
humidity = float(dht_dat[0]); // Humidity
}
else if (Par3 == 12)
{
temperature = float(dht_dat[2]*10 + (dht_dat[3] & 0x7f)) / 10.0; // Temperature
if (dht_dat[3] & 0x80) { temperature = -temperature; } // Negative temperature
humidity = float(dht_dat[0]*10+dht_dat[1]) / 10.0; // Humidity
}

if (Par3 == 22)
{
if (dht_dat[2] & 0x80) // negative temperature
temperature = -0.1 * word(dht_dat[2] & 0x7F, dht_dat[3]);
else
temperature = 0.1 * word(dht_dat[2], dht_dat[3]);
humidity = word(dht_dat[0], dht_dat[1]) * 0.1; // Humidity
}
if (temperature != NAN || humidity != NAN) // According to negated original if, maybe use && instead?
{
UserVar[event->BaseVarIndex] = temperature;
UserVar[event->BaseVarIndex + 1] = humidity;
String log = F("DHT : Temperature: ");
log += UserVar[event->BaseVarIndex];
addLog(LOG_LEVEL_INFO, log);
log = F("DHT : Humidity: ");
log += UserVar[event->BaseVarIndex + 1];
addLog(LOG_LEVEL_INFO, log);
success = true;
}
} // checksum
} // error
} // dht
} // !dht
if(!success)
byte dht_check_sum = (dht_dat[0] + dht_dat[1] + dht_dat[2] + dht_dat[3]) & 0xFF; // check check_sum
if (dht_dat[4] != dht_check_sum)
{
logError(event, "DHT : checksum error!");
break;
}

float temperature = NAN;
float humidity = NAN;
if (Par3 == 11)
{
addLog(LOG_LEVEL_INFO, F("DHT : No reading!"));
UserVar[event->BaseVarIndex] = NAN;
UserVar[event->BaseVarIndex + 1] = NAN;
temperature = float(dht_dat[2]); // Temperature
humidity = float(dht_dat[0]); // Humidity
}
else if (Par3 == 12)
{
temperature = float(dht_dat[2]*10 + (dht_dat[3] & 0x7f)) / 10.0; // Temperature
if (dht_dat[3] & 0x80) { temperature = -temperature; } // Negative temperature
humidity = float(dht_dat[0]*10+dht_dat[1]) / 10.0; // Humidity
}
else if (Par3 == 22 || Par3 == 23 || Par3 == 70)
{
if (dht_dat[2] & 0x80) // negative temperature
temperature = -0.1 * word(dht_dat[2] & 0x7F, dht_dat[3]);
else
temperature = 0.1 * word(dht_dat[2], dht_dat[3]);
humidity = 0.1 * word(dht_dat[0], dht_dat[1]); // Humidity
}

if (temperature == NAN || humidity == NAN)
{ logError(event, "DHT : invalid NAN reading !");
break;
}

UserVar[event->BaseVarIndex] = temperature;
UserVar[event->BaseVarIndex + 1] = humidity;
String log = F("DHT : Temperature: ");
log += UserVar[event->BaseVarIndex];
addLog(LOG_LEVEL_INFO, log);
log = F("DHT : Humidity: ");
log += UserVar[event->BaseVarIndex + 1];
addLog(LOG_LEVEL_INFO, log);
success = true;
break;
}
}
return success;
}


/*********************************************************************************************\
* DHT sub to log an error
\*********************************************************************************************/
void logError(struct EventStruct *event, String text)
{
addLog(LOG_LEVEL_INFO, text);
UserVar[event->BaseVarIndex] = NAN;
UserVar[event->BaseVarIndex + 1] = NAN;
}

/*********************************************************************************************\
* DHT sub to wait until a pin is in a certiin state
\*********************************************************************************************/
boolean waitState(int state)
{
byte counter = 0;
while (( digitalRead(Plugin_005_DHT_Pin) != state) && (counter < 100))
{
delayMicroseconds(1);
counter++;
}
if( counter < 100) return false;
return true;
}

/*********************************************************************************************\
* DHT sub to get an 8 bit value from the receiving bitstream
\*********************************************************************************************/
Expand All @@ -172,7 +192,6 @@ int Plugin_005_read_dht_dat(void)
byte i = 0;
byte result = 0;
byte counter = 0;
//noInterrupts();
for (i = 0; i < 8; i++)
{
while ((!digitalRead(Plugin_005_DHT_Pin)) && (counter < 100))
Expand All @@ -182,10 +201,9 @@ int Plugin_005_read_dht_dat(void)
}
if (counter >= 100)
{
//interrupts();
return -1;
}
delayMicroseconds(30);
delayMicroseconds(35); // was 30
if (digitalRead(Plugin_005_DHT_Pin))
result |= (1 << (7 - i));
counter = 0;
Expand All @@ -196,10 +214,8 @@ int Plugin_005_read_dht_dat(void)
}
if (counter >= 100)
{
//interrupts();
return -1;
}
}
//interrupts();
return result;
}

2 comments on commit c0c6536

@rolandsteinmeyer
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only getting NAN for Humidity and Temperature with SONOFF AM2301 connected to D7 of a Wemos D1. Used additional external 4k7 Pullup as advised.

@TD-er
Copy link
Member

@TD-er TD-er commented on c0c6536 Dec 16, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have one of these connected to a Sonoff TH16
The forest readings are indeed NaN, but after some reading it is reporting fine.

Please sign in to comment.