Compare commits

..

No commits in common. "cd677468ae866ff2987111941bb7ebca5f5de302" and "69bd4f57e30e1f2302df4d02a7ac56ac9c81045c" have entirely different histories.

5 changed files with 10 additions and 33 deletions

2
.gitignore vendored
View File

@ -78,4 +78,4 @@ crashlytics-build.properties
# End of https://www.toptal.com/developers/gitignore/api/unity # End of https://www.toptal.com/developers/gitignore/api/unity
IOT/docs/doxygen output/* IOT/docs/doxygen output/*

View File

@ -14,24 +14,17 @@ build_flags =
-D MONITOR_SPEED=${config.monitor_speed} -D MONITOR_SPEED=${config.monitor_speed}
; DO NOT TOUCH --- END ; DO NOT TOUCH --- END
; DHT pin and type -D API_HOST=\"iot.epi.cb85.software\"
; 5v
-D DHTTYPE=\"DHT11\"
-D DHTPIN=2
; ULTRASON pin
; 5v
-D ULTRA_SOUND_TRIGD=12 -D ULTRA_SOUND_TRIGD=12
-D ULTRA_SOUND_ECHO=13 -D ULTRA_SOUND_ECHO=13
; Capteur poids
-D POID_DOUT=14 -D POID_DOUT=14
-D POID_SCK=15 -D POID_SCK=15
-D MOYENNE_CALIBRATION=20 -D MOYENNE_CALIBRATION=20
; trash can ID
-D TRASHCAN_ONE=\"gdnuxl0wlgurtj3\" -D TRASHCAN_ONE=\"gdnuxl0wlgurtj3\"
-D TRASHCAN_TWO=\"4brip5fwm001bs9\" -D TRASHCAN_TWO=\"4brip5fwm001bs9\"

View File

@ -1,7 +1,6 @@
#ifndef PROGRAM_H #ifndef PROGRAM_H
#define PROGRAM_H #define PROGRAM_H
#include <DHT.h>
#include <Arduino.h> #include <Arduino.h>
#include <Ultrasonic.h> #include <Ultrasonic.h>
@ -25,12 +24,6 @@ public:
private: private:
/* data */ /* data */
/**
* @brief capteur humi/temp
*
*/
DHT *dht;
/** /**
* @brief capteur ultra son pour le niveau de remplissage de la poubelle * @brief capteur ultra son pour le niveau de remplissage de la poubelle
* *

View File

@ -38,8 +38,6 @@ monitor_flags =
lib_deps = lib_deps =
bportaluri/WiFiEsp@^2.2.2 ; gestion des commande 'AT' de l'esp01 bportaluri/WiFiEsp@^2.2.2 ; gestion des commande 'AT' de l'esp01
arduino-libraries/Arduino_JSON@^0.2.0 ; gestion des json arduino-libraries/Arduino_JSON@^0.2.0 ; gestion des json
adafruit/DHT sensor library@^1.4.4 ; DHT11 lib
adafruit/Adafruit Unified Sensor@^1.1.9 ; adafruit sensor lib (required by DHT11)
ericksimoes/Ultrasonic@^3.0.0 ; lib capteur ultra son ericksimoes/Ultrasonic@^3.0.0 ; lib capteur ultra son
bogde/HX711@0.7.5 ; lib pour la balance bogde/HX711@0.7.5 ; lib pour la balance
; example: ; example:

View File

@ -3,39 +3,32 @@
int distance; int distance;
Program::Program() Program::Program(){
// Serial Serial.begin(MONITOR_SPEED); //motitor pour debug
Serial.begin(MONITOR_SPEED); // motitor pour debug Serial1.begin(MONITOR_SPEED); //port serie pour l'esp
Serial1.begin(MONITOR_SPEED); // port serie pour l'esp
///////INITIALISATION OBJ////// ///////INITIALISATION OBJ//////
this->api = new API(USER_NAME, USER_PASSWORD, API_HOST); this->api = new API(USER_NAME, USER_PASSWORD, API_HOST);
this->ultrasonic = new Ultrasonic(ULTRA_SOUND_TRIGD, ULTRA_SOUND_ECHO); this->ultrasonic = new Ultrasonic(ULTRA_SOUND_TRIGD, ULTRA_SOUND_ECHO);
this->balance = new Balance(POID_DOUT,POID_SCK); this->balance = new Balance(POID_DOUT,POID_SCK);
this->dht = new DHT(DHTPIN, DHTTYPE);
///////INITIALISATION OK////// ///////INITIALISATION OK//////
this->api->wifiBegin(WIFI_SSID, WIFI_PASSWORD, &Serial1);
Serial.print("start calibr : "); Serial.print("start calibr : ");
this->balance->initCalibration(); this->balance->initCalibration();
this->balance->setCalibrationFact(1077);
Serial.println("OK"); Serial.println("OK");
//this->api->wifiBegin(WIFI_SSID, WIFI_PASSWORD, &Serial1); this->balance->setCalibrationFact(1077);
dht->begin();
} }
void Program::loop(){ void Program::loop(){
distance = this->ultrasonic->read(); distance = this->ultrasonic->read();
//TODO: envoyer les infos des capteur par la suite
Serial.println("Temperature = " + String(dht->readTemperature())+" °C");
Serial.println("Humidite = " + String(dht->readHumidity())+" %");
//this->api->sendValue(JSONVar::stringify(distance), TRASHCAN_ONE, "W", false); //TODO: faire estimation poubelle plenne //this->api->sendValue(JSONVar::stringify(distance), TRASHCAN_ONE, "W", false); //TODO: faire estimation poubelle plenne
//this->api->sendValue(this->balance->getValue(), TRASHCAN_TWO, ,false); //TODO: faire estimation poubelle plenne this->api->sendValue(this->balance->getValue(), TRASHCAN_TWO, ,false)
Serial.print("Distance in CM: "); Serial.print("Distance in CM: ");
Serial.println(distance); Serial.println(distance);
delay(1000); delay(10000);
} }