Merge pull request #7245 from stefan-oskamp/development

Support for I2C sensor DHT12

I2CDEVICES.md

@@ -61,4 +61,5 @@ Index | Define              | Driver  | Device   | Address(es) | Description
   38  | USE_DISPLAY_ILI9488 | xdsp_08 | FT6236   | 0x38        | Touch panel controller
   39  | USE_DISPLAY_RA8876  | xdsp_10 | FT5316   | 0x38        | Touch panel controller
   40  | USE_TSL2591         | xsns_57 | TLS2591  | 0x29        | Light intensity sensor
+  41  | USE_DHT12           | xsns_58 | DHT12    | 0x5C        | Temperature and humidity sensor
 

tasmota/my_user_config.h

@@ -418,6 +418,7 @@
 //  #define USE_PAJ7620                            // [I2cDriver34] Enable PAJ7620 gesture sensor (I2C address 0x73) (+2.5k code)
 //  #define USE_PCF8574                            // [I2cDriver2] Enable PCF8574 I/O Expander (I2C addresses 0x20 - 0x26 and 0x39 - 0x3F) (+1k9 code)
 //  #define USE_HIH6                               // [I2cDriver36] Enable Honeywell HIH Humidity and Temperature sensor (I2C address 0x27) (+0k6)
+//  #define USE_DHT12                              // [I2cDriver41] Enable DHT12 humidity and temperature sensor (I2C address 0x5C) (+0k7 code)
 
 //  #define USE_DISPLAY                            // Add I2C Display Support (+2k code)
     #define USE_DISPLAY_MODES1TO5                // Enable display mode 1 to 5 in addition to mode 0

tasmota/tasmota_post.h

@@ -135,6 +135,7 @@ char* ToHex_P(const unsigned char * in, size_t insz, char * out, size_t outsz, c
 #define USE_SGP30                                // Add I2C code for SGP30 sensor (+1k1 code)
 //#define USE_SI1145                               // Add I2C code for SI1145/46/47 sensor (+1k code)
 #define USE_LM75AD                               // Add I2C code for LM75AD sensor (+0k5 code)
+#define USE_DHT12                                // Add I2C code for DHT12 temperature and humidity sensor (+0k7 code)
 //#define USE_APDS9960                             // Add I2C code for APDS9960 Proximity Sensor. Disables SHT and VEML6070 (+4k7 code)
 //#define USE_MCP230xx                             // Enable MCP23008/MCP23017 - Must define I2C Address in #define USE_MCP230xx_ADDR below - range 0x20 - 0x27 (+4k7 code)
 //  #define USE_MCP230xx_ADDR 0x20                 // Enable MCP23008/MCP23017 I2C Address to use (Must be within range 0x20 through 0x27 - set according to your wired setup)

tasmota/xsns_58_dht12.ino

@@ -0,0 +1,140 @@
+/*
+  xsns_58_dht12.ino - DHT12 I2C temperature and humidity sensor support for Tasmota
+
+  Copyright (C) 2019  Stefan Oskamp and Theo Arends
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifdef USE_I2C
+#ifdef USE_DHT12
+/*********************************************************************************************\
+ * DHT12 - Temperature and Humidity
+ *
+ * I2C Address: 0x5C
+\*********************************************************************************************/
+
+#define XSNS_58              58
+#define XI2C_41              41  // See I2CDEVICES.md
+
+#define DHT12_ADDR          (uint8_t) 0x5C
+
+char    dht12_name[] = "DHT12-0x00";
+uint8_t dht12_count = 0;
+float   dht12_temperature = NAN;
+float   dht12_humidity = NAN;
+
+bool Dht12Read(void)
+{
+    Wire.beginTransmission(DHT12_ADDR);
+    Wire.write(0);
+    if (Wire.endTransmission() != 0) {
+        return false;
+    }
+    delay(50);
+    Wire.requestFrom(DHT12_ADDR, (uint8_t) 5);
+    delay(5);
+    uint8_t humidity      = Wire.read();
+    uint8_t humidityTenth = Wire.read();
+    uint8_t temp          = Wire.read();
+    uint8_t tempTenth     = Wire.read();
+    uint8_t checksum      = Wire.read();
+    dht12_humidity    = (float) humidity + (float) humidityTenth/(float) 10.0;
+    dht12_temperature = (float) temp     + (float) tempTenth/(float) 10.0;
+    return (!isnan(dht12_temperature) && !isnan(dht12_humidity));
+}
+
+void Dht12Detect(void)
+{
+    if (Dht12Read()) {
+        snprintf_P(log_data, sizeof(log_data), S_LOG_I2C_FOUND_AT, dht12_name, DHT12_ADDR);
+        AddLog(LOG_LEVEL_DEBUG);
+        snprintf_P(dht12_name, sizeof(dht12_name), PSTR("%s%c0x%02X"), "DHT12", IndexSeparator(), DHT12_ADDR);
+        dht12_count = 1;
+    }
+}
+
+void Dht12Show(bool json)
+{
+  if (dht12_count > 0)
+  {
+    char temperature[33];
+    dtostrfd(dht12_temperature, Settings.flag2.temperature_resolution, temperature);
+    char humidity[33];
+    dtostrfd(dht12_humidity, Settings.flag2.humidity_resolution, humidity);
+
+    if (json)
+    {
+      ResponseAppend_P(JSON_SNS_TEMPHUM, dht12_name, temperature, humidity);
+#ifdef USE_DOMOTICZ
+      if ((0 == tele_period))
+      {
+        DomoticzTempHumSensor(temperature, humidity);
+      }
+#endif // USE_DOMOTICZ
+
+#ifdef USE_KNX
+      if (0 == tele_period)
+      {
+        KnxSensor(KNX_TEMPERATURE, dht12_temperature);
+        KnxSensor(KNX_HUMIDITY, dht12_humidity);
+      }
+#endif // USE_KNX
+
+#ifdef USE_WEBSERVER
+    }
+    else
+    {
+      WSContentSend_PD(HTTP_SNS_TEMP, dht12_name, temperature, TempUnit());
+      WSContentSend_PD(HTTP_SNS_HUM, dht12_name, humidity);
+#endif // USE_WEBSERVER
+    }
+  }
+}
+
+
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+bool Xsns58(uint8_t function)
+{
+  if (!I2cEnabled(XI2C_41)) { return false; }
+
+  bool result = false;
+
+  if (FUNC_INIT == function) {
+    Dht12Detect();
+  }
+  else if (dht12_count > 0) {
+    switch (function) {
+    case FUNC_EVERY_SECOND:
+      Dht12Read();
+      break;
+    case FUNC_JSON_APPEND:
+      Dht12Show(1);
+      break;
+#ifdef USE_WEBSERVER
+    case FUNC_WEB_SENSOR:
+      Dht12Show(0);
+      break;
+#endif  // USE_WEBSERVER
+    }
+  }
+  return result;
+}
+
+#endif  // USE_DHT12
+#endif  // USE_I2C