Epitech/T-DEV-811
4
0
Fork 0
Code Issues 7 Pull Requests 1 Packages Projects 1 Releases Wiki Activity

feat: création classe abstraite capteur #44

Merged
Clement merged 37 commits from refactor/class-abstraite-capteur into master 2023-05-13 10:58:51 +00:00
Conversation 2 Commits 37 Files Changed 14 +11 -8
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e002adacdd - Show all commits

4
IOT/include/Program.h
View File

@ -4,6 +4,8 @@
#include <Arduino.h> #include <Arduino.h>
#include <Ultrasonic.h> #include <Ultrasonic.h>
#include "API.h" #include "API.h"
#include "Capteur.h"
#include "Ultrason.h"
class Program{ class Program{
public: public:
@ -26,7 +28,7 @@ private:
* @brief capteur ultra son pour le niveau de remplissage de la poubelle * @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 * @brief Réference de l'API pour les calls

15
IOT/src/Program.cpp
View File

@ -7,18 +7,19 @@ Program::Program(){
Serial.begin(MONITOR_SPEED); Serial.begin(MONITOR_SPEED);
////////API/////// ////////API///////
this->api = new API(USER_NAME, USER_PASSWORD, API_HOST); //this->api = new API(USER_NAME, USER_PASSWORD, API_HOST);
this->api->wifiBegin(WIFI_SSID, WIFI_PASSWORD, &Serial1); //this->api->wifiBegin(WIFI_SSID, WIFI_PASSWORD, &Serial1);
//////CAPTEUR///// //////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(){ 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.print("Distance in CM: ");
Serial.println(distance); Serial.print(distance);
delay(10000); Serial.println(this->ultrasonic->isFull());
delay(1000);
} }