From 7574061becf5b2be53280cdcf16911fe6e43bf4a Mon Sep 17 00:00:00 2001 From: Clement Date: Tue, 2 May 2023 17:25:03 +0200 Subject: [PATCH] feat : gestion Capteur DJT (a tester) --- IOT/lib/Capteur/include/HumiTemp.h | 1 + IOT/lib/Capteur/src/HumiTemp.cpp | 3 +-- IOT/src/Program.cpp | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/IOT/lib/Capteur/include/HumiTemp.h b/IOT/lib/Capteur/include/HumiTemp.h index 71a8632..d94473a 100644 --- a/IOT/lib/Capteur/include/HumiTemp.h +++ b/IOT/lib/Capteur/include/HumiTemp.h @@ -24,6 +24,7 @@ public: * @return String valeur format "XX/YY" X% et Y°C */ String read(); + private: DHT* capteur; diff --git a/IOT/lib/Capteur/src/HumiTemp.cpp b/IOT/lib/Capteur/src/HumiTemp.cpp index 0cde489..10fbd56 100644 --- a/IOT/lib/Capteur/src/HumiTemp.cpp +++ b/IOT/lib/Capteur/src/HumiTemp.cpp @@ -1,9 +1,8 @@ #include "../include/HumiTemp.h" - HumiTemp::HumiTemp(int pin, String type, String fullVall): Capteur("H/T",fullVall){ - this->capteur = new DHT(pin,type); + this->capteur = new DHT(pin, type.c_str()); this->capteur->begin(); } diff --git a/IOT/src/Program.cpp b/IOT/src/Program.cpp index 658577d..ff791af 100644 --- a/IOT/src/Program.cpp +++ b/IOT/src/Program.cpp @@ -19,15 +19,15 @@ Program::Program(){ void Program::loop(){ String distance = this->ultrasonic->read(); - - //TODO: envoyer les infos des capteur par la suite - - Serial.println("humiTemp = " + this->dht->read()); + String humitemp = this->dht->read(); //this->api->sendValue(distance, TRASHCAN_ONE, this->ultrasonic->getValType(), this->ultrasonic->isFull()); - Serial.print("Distance in CM: "); - Serial.print(distance); + Serial.print("Distance in CM = " + distance); Serial.println(this->ultrasonic->isFull()?" true":" false"); + //this->api->sendValue(humitemp, TRASHCAN_TWO, this->dht->getValType(), this->dht->isFull()); + Serial.print("humiTemp = " + this->dht->read()); + Serial.println(this->dht->isFull()?" true":" false"); + delay(1000); } \ No newline at end of file