diff --git a/IOT/include/Program.h b/IOT/include/Program.h index 549809b..88b39e4 100644 --- a/IOT/include/Program.h +++ b/IOT/include/Program.h @@ -4,6 +4,8 @@ #include #include #include "API.h" +#include "Capteur.h" +#include "Ultrason.h" class Program{ public: @@ -26,7 +28,7 @@ private: * @brief capteur ultra son pour le niveau de remplissage de la poubelle * */ - Ultrasonic *ultrasonic; + Capteur *ultrasonic; /** * @brief Réference de l'API pour les calls diff --git a/IOT/src/Program.cpp b/IOT/src/Program.cpp index bf73cd5..6825d40 100644 --- a/IOT/src/Program.cpp +++ b/IOT/src/Program.cpp @@ -7,18 +7,19 @@ Program::Program(){ Serial.begin(MONITOR_SPEED); ////////API/////// - this->api = new API(USER_NAME, USER_PASSWORD, API_HOST); - this->api->wifiBegin(WIFI_SSID, WIFI_PASSWORD, &Serial1); + //this->api = new API(USER_NAME, USER_PASSWORD, API_HOST); + //this->api->wifiBegin(WIFI_SSID, WIFI_PASSWORD, &Serial1); //////CAPTEUR///// - this->ultrasonic = new Ultrasonic(ULTRA_SOUND_TRIGD, ULTRA_SOUND_ECHO); + this->ultrasonic = new Ultrason(ULTRA_SOUND_TRIGD, ULTRA_SOUND_ECHO, String(10));//TODO: mettre la valeur en config } void Program::loop(){ - int distance = this->ultrasonic->read(); + String distance = this->ultrasonic->read(); - this->api->sendValue(JSONVar::stringify(distance), TRASHCAN_ONE, "W", false); + //this->api->sendValue(distance, TRASHCAN_ONE, "W", false); Serial.print("Distance in CM: "); - Serial.println(distance); - delay(10000); + Serial.print(distance); + Serial.println(this->ultrasonic->isFull()); + delay(1000); } \ No newline at end of file