Merge branch 'master' into feat/DHT-11-humi-dans-temp-capteur

IOT/src/Program.cpp

@@ -1,20 +1,32 @@
 #include "Program.h"
 
+int distance;
+
 
 Program::Program(){
+    Serial1.begin(MONITOR_SPEED);
+    Serial.begin(MONITOR_SPEED);
+
     // INIT OBJ
     this->dht = new DHT(DHTPIN, DHTTYPE);
-    
-    Serial.begin(MONITOR_SPEED);
+    this->api = new API(USER_NAME, USER_PASSWORD, API_HOST);
+    this->ultrasonic = new Ultrasonic(ULTRA_SOUND_TRIGD, ULTRA_SOUND_ECHO);
+
+    this->api->wifiBegin(WIFI_SSID, WIFI_PASSWORD, &Serial1);
     dht->begin();
 }
 
 void Program::loop(){
-
+    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())+" %");
     
     delay(1000);
+    this->api->sendValue(JSONVar::stringify(distance), TRASHCAN_ONE, "W", false);
+    Serial.print("Distance in CM: ");
+    Serial.println(distance);
+    delay(10000);
 }

IOT/src/main.cpp

@@ -1,12 +1,16 @@
+#ifndef TESTING
+
 #include <Arduino.h>
 #include "Program.h"
 
 Program* program;
 
 void setup() {
-  program = new Program();
+    program = new Program();
 }
 
 void loop() {
-  program->loop();
+    program->loop();
 }
+
+#endif