Merge remote-tracking branch 'origin/master' into feat/balance

IOT/src/Program.cpp

@@ -1,10 +1,22 @@
 #include "Program.h"
 
+int distance;
+
 
 Program::Program(){
-    
+    this->api = new API(USER_NAME, USER_PASSWORD, API_HOST);
+    Serial1.begin(MONITOR_SPEED);
+    this->api->wifiBegin(WIFI_SSID, WIFI_PASSWORD, &Serial1);
+
+    Serial.begin(MONITOR_SPEED);
+    this->ultrasonic = new Ultrasonic(ULTRA_SOUND_TRIGD, ULTRA_SOUND_ECHO);
 }
 
 void Program::loop(){
-
+    distance = this->ultrasonic->read();
+    
+    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,3 +1,5 @@
+#ifndef TESTING
+
 #include <Arduino.h>
 // #include "Program.h"
 
@@ -33,9 +35,13 @@ void setup(){
 
   balance->setCalibrationFact(1077);
 
+void setup() {
+    program = new Program();
 }
 
 void loop(){
   // delay(500);
   Serial.println(balance->getValue());
-}
+}
+
+#endif