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

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

diff --git a/IOT/include/Program.h b/IOT/include/Program.h
index 549809b..9e34e98 100644
--- a/IOT/include/Program.h
+++ b/IOT/include/Program.h
@@ -3,7 +3,9 @@
 
 #include <Arduino.h>
 #include <Ultrasonic.h>
+
 #include "API.h"
+#include "Balance.h"
 
 class Program{
 public:
@@ -28,6 +30,13 @@ private:
      */
     Ultrasonic *ultrasonic;
 
+    /**
+     * @brief capteur poid pour le niveau de remplissage de la poubelle
+     * 
+     */
+    Balance *balance;
+
+
     /**
     * @brief Réference de l'API pour les calls
     * 
diff --git a/IOT/src/Program.cpp b/IOT/src/Program.cpp
index 710d302..8235270 100644
--- a/IOT/src/Program.cpp
+++ b/IOT/src/Program.cpp
@@ -4,18 +4,30 @@ int distance;
 
 
 Program::Program(){
+    Serial.begin(MONITOR_SPEED); //motitor pour debug
+    Serial1.begin(MONITOR_SPEED); //port serie pour l'esp
+
+    ///////INITIALISATION OBJ//////
     this->api = new API(USER_NAME, USER_PASSWORD, API_HOST);
-    Serial1.begin(MONITOR_SPEED);
+    this->ultrasonic = new Ultrasonic(ULTRA_SOUND_TRIGD, ULTRA_SOUND_ECHO);
+    this->balance = new Balance(POID_DOUT,POID_SCK);
+    ///////INITIALISATION OK//////
+
     this->api->wifiBegin(WIFI_SSID, WIFI_PASSWORD, &Serial1);
 
-    Serial.begin(MONITOR_SPEED);
-    this->ultrasonic = new Ultrasonic(ULTRA_SOUND_TRIGD, ULTRA_SOUND_ECHO);
+    Serial.print("start calibr : ");
+    this->balance->initCalibration();
+    Serial.println("OK");
+
+    this->balance->setCalibrationFact(1077);
 }
 
 void Program::loop(){
     distance = this->ultrasonic->read();
     
-    this->api->sendValue(JSONVar::stringify(distance), TRASHCAN_ONE, "W", false);
+
+    //this->api->sendValue(JSONVar::stringify(distance), TRASHCAN_ONE, "W", false); //TODO: faire estimation poubelle plenne
+    this->api->sendValue(this->balance->getValue(), TRASHCAN_TWO, ,false)
     Serial.print("Distance in CM: ");
     Serial.println(distance);
     delay(10000);