Support DHT20 on GIGA R1

Author: alranel

examples/Combined_Demo/Combined_Demo.ino

@@ -5,6 +5,11 @@
 
 #include "Arduino_SensorKit.h"
 
+// Uncomment line below if your SensorKit is the variant with the DHT20 sensor
+// (It's marked IIC on the PCB and has a black cover, while the DHT11 sensor
+// has a blue cover.)
+//#define Environment Environment_I2C
+
 #define BUZZER 5
 #define BUTTON  4
 #define LED 6

examples/Temp_and_Humidity/Temp_and_Humidity.ino

@@ -1,13 +1,13 @@
 #include "Arduino_SensorKit.h"
 
-//uncomment line below if using DHT20
+// Uncomment line below if your SensorKit is the variant with the DHT20 sensor
+// (It's marked IIC on the PCB and has a black cover, while the DHT11 sensor
+// has a blue cover.)
 //#define Environment Environment_I2C
 
 void setup() {
-  //uncomment line below if using DHT20
-  //Wire.begin();
-
-  //uncomment line below if you're connecting your DHT20 to pin a different than 3
+  // Uncomment line below if your kit has a DHT11 and you're connecting it to 
+  // a pin different than 3
   //Environment.setPin(4);
 
   Serial.begin(9600);

library.properties

@@ -8,4 +8,4 @@ category=Sensors
 url=https://sensorkit.arduino.cc/
 architectures=avr,mbed_giga
 precompiled=false
-depends=Grove-3-Axis-Digital-Accelerometer-2g-to-16g-LIS3DHTR
+depends=Grove-3-Axis-Digital-Accelerometer-2g-to-16g-LIS3DHTR,DHT20

src/Arduino_SensorKit.cpp

@@ -2,7 +2,7 @@
 
 //Declare component's classes
 SensorKit_Oled Oled;
-SensorKit_DHT Environment(3,DHT11);
-DHT Environment_I2C(DHT20);
+SensorKit_DHT11 Environment(3,DHT11);
+SensorKit_DHT20 Environment_I2C;
 SensorKit_LIS3DHTR Accelerometer(_WIRE);
 SensorKit_BMP280 Pressure(_WIRE);

src/Arduino_SensorKit.h

@@ -14,6 +14,8 @@
 #include "Arduino_SensorKit_BMP280.h"   // Pressure
 #include "Arduino_SensorKit_LIS3DHTR.h" // Accel
 #include "Grove_Temperature_And_Humidity_Sensor/DHT.h"                        // Temp & Humidity
+#undef DHT20
+#include <DHT20.h>                                                           // Temp & Humidity
 #include "U8g2/src/U8x8lib.h"                    // OLED Display
 
 #if defined(ARDUINO_ARCH_AVR) || defined(ARDUINO_ARCH_MEGAAVR) || defined(ARDUINO_UNOR4_MINIMA) || defined(ARDUINO_UNOR4_WIFI)
@@ -28,8 +30,6 @@
   #error "This board is not supported by Arduino_SensorKit"
 #endif
 
-class SensorKit_DHT;
-
 // The upstream U8X8 library provides two variants, one for hardware I2C (using 
 // the Wire object provided by Arduino) and one for software I2C. The latter 
 // doesn't seem to work. However it seems that when breaking the sensors from
@@ -54,18 +54,31 @@ class SensorKit_Oled : public _Oled_class {
 };
 extern SensorKit_Oled Oled;
 
+class SensorKit_DHT11;
+class SensorKit_DHT20;
 extern SensorKit_LIS3DHTR Accelerometer;
 extern SensorKit_BMP280 Pressure;
-extern SensorKit_DHT Environment;
-extern DHT Environment_I2C;
+extern SensorKit_DHT11 Environment;
+extern SensorKit_DHT20 Environment_I2C;
 
-//Subclass DHT
-class SensorKit_DHT : public DHT {
+// Subclass DHT
+class SensorKit_DHT11 : public DHT {
   public:
-  SensorKit_DHT(uint8_t pin, uint8_t type) : DHT(pin, type) {};
+  SensorKit_DHT11(uint8_t pin, uint8_t type) : DHT(pin, type) {};
   void setPin(uint8_t pin) {
-    Environment = SensorKit_DHT(pin, DHT11);
+    Environment = SensorKit_DHT11(pin, DHT11);
+  };
+};
+
+class SensorKit_DHT20 : public DHT20 {
+  public:
+  SensorKit_DHT20() : DHT20(&_WIRE) {};
+  bool begin(void) {
+    _WIRE.begin();
+    return DHT20::begin();
   };
+  float readHumidity() { read(); return getHumidity(); };
+  float readTemperature() { read(); return getTemperature(); };
 };
 
 #endif