From 36dd744da5048bcf25ffc3193477f452df4bf8a8 Mon Sep 17 00:00:00 2001
From: Clement <c.boesmier@aptatio.com>
Date: Tue, 2 May 2023 22:01:20 +0200
Subject: [PATCH] add balance to main program

---
 IOT/include/Program.h | 4 +---
 IOT/src/Program.cpp   | 9 ++++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/IOT/include/Program.h b/IOT/include/Program.h
index 94947e1..075a386 100644
--- a/IOT/include/Program.h
+++ b/IOT/include/Program.h
@@ -44,9 +44,7 @@ private:
      * @brief capteur poid pour le niveau de remplissage de la poubelle
      * 
      */
-    Balance *balance;
-
-//TODO chagé type to capteur
+    Capteur *balance;
 
     /**
     * @brief Réference de l'API pour les calls
diff --git a/IOT/src/Program.cpp b/IOT/src/Program.cpp
index 6dc6238..fc5618d 100644
--- a/IOT/src/Program.cpp
+++ b/IOT/src/Program.cpp
@@ -14,14 +14,14 @@ Program::Program(){
     //////CAPTEUR/////
     this->ultrasonic = new Ultrason(ULTRA_SOUND_TRIGD, ULTRA_SOUND_ECHO, "10");//TODO: mettre la valeur en config
     this->dht = new HumiTemp(DHTPIN, DHTTYPE, "20:30/60:80");//TODO: mettre la valeur en config
-
-    //TODO: init balance
-    //calibration factor : 1077
+    this->balance = new Balance(POID_DOUT,POID_SCK,"500");//TODO: mettre la valter en donfig
+    this->balance->tar(1077);
 }
 
 void Program::loop(){
     String distance = this->ultrasonic->read();
     String humitemp = this->dht->read();
+    String poid = this->balance->read();
     
     //this->api->sendValue(distance, TRASHCAN_ONE, this->ultrasonic->getValType(), this->ultrasonic->isFull());
     Serial.print("Distance in CM = " + distance);
@@ -32,6 +32,9 @@ void Program::loop(){
     Serial.println(this->dht->isFull()?" true":" false");
 
     //TODO: Lire balance
+    //this->api->sendValue(poid, TRASHCAN_TWO, this->balance->getValType(), this->balance->isFull());
+    Serial.print("humiTemp = " + this->dht->read());
+    Serial.println(this->dht->isFull()?" true":" false");
 
     delay(1000);
 }
\ No newline at end of file