From b1728b05094d1f222f673981b482cf521ed38297 Mon Sep 17 00:00:00 2001
From: Clement <c.boesmier@aptatio.com>
Date: Tue, 4 Apr 2023 11:22:24 +0200
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20int=C3=A9gration=20DHT=20capteur?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IOT/config.ini        |  3 ++-
 IOT/include/Program.h |  8 ++++++++
 IOT/platformio.ini    |  2 ++
 IOT/src/Program.cpp   | 10 ++++++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/IOT/config.ini b/IOT/config.ini
index 11acf53..c2c0bf6 100644
--- a/IOT/config.ini
+++ b/IOT/config.ini
@@ -15,6 +15,7 @@ build_flags =
 ; DO NOT TOUCH --- END
 
     -D API_HOST=\"iot.epi.cb85.software\"
+    -D DHTTYPE=\"DHT11\"
+    -D DHTPIN=2
 
-    -D EXAMPLE_NUMBER=69
 
diff --git a/IOT/include/Program.h b/IOT/include/Program.h
index 53a6189..5823313 100644
--- a/IOT/include/Program.h
+++ b/IOT/include/Program.h
@@ -1,6 +1,8 @@
 #ifndef PROGRAM_H
 #define PROGRAM_H
 
+#include "DHT.h"
+
 class Program{
 public:
     /**
@@ -17,5 +19,11 @@ public:
 
 private:
     /* data */
+
+    /**
+     * @brief capteur humi/temp
+     * 
+     */
+    DHT *dht;
 };
 #endif
\ No newline at end of file
diff --git a/IOT/platformio.ini b/IOT/platformio.ini
index c06a691..e3e4dac 100644
--- a/IOT/platformio.ini
+++ b/IOT/platformio.ini
@@ -38,6 +38,8 @@ monitor_flags =
 lib_deps =
     bportaluri/WiFiEsp@^2.2.2 ; gestion des commande 'AT' de l'esp01
     arduino-libraries/Arduino_JSON@^0.2.0 ; gestion des json
+    adafruit/DHT sensor library@^1.4.4 ; DHT11 lib
+    adafruit/Adafruit Unified Sensor@^1.1.9 ; adafruit sensor lib (required by DHT11)
 ;    example:
 ;    erropix/ESP32 AnalogWrite@^0.2
 
diff --git a/IOT/src/Program.cpp b/IOT/src/Program.cpp
index 952be1b..7a3babf 100644
--- a/IOT/src/Program.cpp
+++ b/IOT/src/Program.cpp
@@ -2,9 +2,19 @@
 
 
 Program::Program(){
+    // INIT OBJ
+    this->dht = new DHT(DHTPIN, DHTTYPE);
     
+    Serial.begin(MONITOR_SPEED);
+    dht->begin();
 }
 
 void Program::loop(){
 
+    //TODO: envoyer les infos des capteur par la suite
+
+    Serial.println("Temperature = " + String(dht->readTemperature())+" °C");
+    Serial.println("Humidite = " + String(dht->readHumidity())+" %");
+    
+    delay(1000);
 }
\ No newline at end of file

From fa6662e88597dcaf27e746f9d4b04839d002c19e Mon Sep 17 00:00:00 2001
From: Clement <c.boesmier@aptatio.com>
Date: Tue, 2 May 2023 11:51:39 +0200
Subject: [PATCH 2/2] fix and comment

---
 IOT/config.ini      | 2 ++
 IOT/src/Program.cpp | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/IOT/config.ini b/IOT/config.ini
index 5cd8f5e..511b26a 100644
--- a/IOT/config.ini
+++ b/IOT/config.ini
@@ -15,10 +15,12 @@ build_flags =
 ; DO NOT TOUCH --- END
 
     ; DHT pin and type
+    ; 5v
     -D DHTTYPE=\"DHT11\"
     -D DHTPIN=2
 
     ; ULTRASON pin
+    ; 5v
     -D ULTRA_SOUND_TRIGD=12
     -D ULTRA_SOUND_ECHO=13
 
diff --git a/IOT/src/Program.cpp b/IOT/src/Program.cpp
index a3d4f6c..75961ac 100644
--- a/IOT/src/Program.cpp
+++ b/IOT/src/Program.cpp
@@ -12,7 +12,7 @@ Program::Program(){
     this->api = new API(USER_NAME, USER_PASSWORD, API_HOST);
     this->ultrasonic = new Ultrasonic(ULTRA_SOUND_TRIGD, ULTRA_SOUND_ECHO);
 
-    this->api->wifiBegin(WIFI_SSID, WIFI_PASSWORD, &Serial1);
+    //this->api->wifiBegin(WIFI_SSID, WIFI_PASSWORD, &Serial1);
     dht->begin();
 }
 
@@ -24,9 +24,8 @@ void Program::loop(){
     Serial.println("Temperature = " + String(dht->readTemperature())+" °C");
     Serial.println("Humidite = " + String(dht->readHumidity())+" %");
     
-    delay(1000);
-    this->api->sendValue(JSONVar::stringify(distance), TRASHCAN_ONE, "W", false);
+    //this->api->sendValue(JSONVar::stringify(distance), TRASHCAN_ONE, "W", false);
     Serial.print("Distance in CM: ");
     Serial.println(distance);
-    delay(10000);
+    delay(1000);
 }
\ No newline at end of file