Adafruit SHT31 Integration

platformio.ini

@@ -18,3 +18,4 @@ lib_deps =
   https://github.com/adafruit/Adafruit_Sensor.git
   https://github.com/adafruit/Adafruit_DHT_Unified.git
   https://github.com/adafruit/DHT-sensor-library
+  https://github.com/adafruit/Adafruit_SHT31.git

src/configure.h

@@ -1,5 +1,6 @@
 #define CCS811_ADDR 0x5B  //#define CCS811_ADDR 0x5A //Alternate I2C Address
-#define DHTPIN 33         
+#define SHT31_ADDR 0x44
+#define DHTPIN 33
 #define DHTTYPE DHT22
 #define LUXAVERAGE 100    // must be smaler than 8 bit
 #define LUXPIN A8

src/main.cpp

@@ -23,9 +23,9 @@ void loop()
   Serial.print(" ppm | LUX: ");
   Serial.print(sensorData.LUX);
   Serial.print(" | Temperature: ");
-  Serial.print(sensorData.TEMP.temperature);
+  Serial.print(sensorData.TEMP);
   Serial.print(" ° C | Humidity: ");
-  Serial.print(sensorData.HUMID.relative_humidity);
+  Serial.print(sensorData.HUMID);
   Serial.print(" % | ");
   Serial.print(sensorData.NOISE);
   Serial.print(" | Motion: ");

src/sensor.cpp

@@ -1,16 +1,14 @@
 #include <Arduino.h>
 #include "sensor.h"
 
-// Air Quality Sensor (CCS811) Libary
+// SparkFun Air Quality Sensor (CCS811) Libary
 #include "SparkFunCCS811.h"
 
-// DHT Sensor Library
-#include <Adafruit_Sensor.h>
-#include <DHT.h>
-#include <DHT_U.h>
+// Adafruit Temperature & Humidity (SHT31) Library
+#include "Adafruit_SHT31.h"
 
 CCS811 airQualitySensor(CCS811_ADDR);
-DHT_Unified dht(DHTPIN, DHTTYPE);
+Adafruit_SHT31 sht31 = Adafruit_SHT31();
 
 struct sensorData_s sensorData;
 volatile uint16_t soundcounter = 0;
@@ -24,23 +22,28 @@ extern void sensor_interupt_handler(void);
 // Sensor Setup
 errorType sensor_setup(void) {
   // Air Quality Sensor (CCS811)
-  CCS811Core::status returnCode = airQualitySensor.begin();
-  if (returnCode != CCS811Core::SENSOR_SUCCESS)
-  {
-    return ERROR_AIRQUALITYSENSOR;
+  // CCS811Core::status returnCode = airQualitySensor.begin();
+  // if (returnCode != CCS811Core::SENSOR_SUCCESS)
+  // {
+  //   return ERROR_AIRQUALITYSENSOR;
+  // }
+
+  // Temperature & Humidity Sensor (SHT31)
+  if (! sht31.begin(SHT31_ADDR)) {
+    return ERROR_TEMPERATURSENSOR;
   }
 
-  // DHT Sensor
-  dht.begin();
-
+  // Sound Detector ()
   pinMode(NOISEPIN, INPUT);
-  pinMode(MOTIONPIN, INPUT);
-
   attachInterrupt(digitalPinToInterrupt(NOISEPIN), sensor_interupt_handler, RISING);
 
+  // Motion Detector ()
+  pinMode(MOTIONPIN, INPUT);
+
   return SENSOROK;
 }
 
+
 void aquireData(void) {
   triggerMessurement();
   getData();
@@ -51,21 +54,17 @@ void triggerMessurement(void) {
   if (airQualitySensor.dataAvailable()) {
     airQualitySensor.readAlgorithmResults();
   }
-
-  //Trigger DHT
-  dht.temperature().getEvent(&sensorData.TEMP);
-  dht.humidity().getEvent(&sensorData.HUMID);
 }
 
 void getData(void) {
   sensorData.CO2 = airQualitySensor.getCO2();
   sensorData.VOC = airQualitySensor.getTVOC();
+  sensorData.TEMP = sht31.readTemperature();
+  sensorData.HUMID = sht31.readHumidity();
   sensorData.LUX = getLux();
   sensorData.MOTION = digitalRead(MOTIONPIN);
   sensorData.NOISE = soundcounter;
   soundcounter = 0;
-
-  // not necessary for DHT, is set via trigger
 }
 
 uint16_t getLux(void) {

src/sensor.h

@@ -3,22 +3,19 @@
 
 #include <Arduino.h>
 
-#include <Adafruit_Sensor.h>
-#include <DHT.h>
-#include <DHT_U.h>
 #include <configure.h>
 
 struct sensorData_s {
   uint16_t CO2;
   uint16_t VOC;
+  float TEMP;
+  float HUMID;
   uint16_t LUX;
-  sensors_event_t TEMP;
-  sensors_event_t HUMID;
   boolean MOTION;
   uint16_t NOISE;
 };
 
-typedef enum { SENSOROK, ERROR_AIRQUALITYSENSOR } errorType;
+typedef enum { SENSOROK, ERROR_AIRQUALITYSENSOR, ERROR_TEMPERATURSENSOR } errorType;
 
 extern struct sensorData_s sensorData;
 extern errorType sensor_setup(void);