From b3da67f31eb39a9294a6c62a2cf131e75975ae85 Mon Sep 17 00:00:00 2001 From: Mathis Date: Mon, 24 Apr 2023 16:05:50 +0200 Subject: [PATCH] feat: Add end to end test for ultrasonic capteur --- IOT/config.ini | 2 ++ IOT/include/Program.h | 7 +++++++ IOT/src/Program.cpp | 8 ++++++-- IOT/test/test_api.cpp | 3 +-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/IOT/config.ini b/IOT/config.ini index 17d9e3f..8a28ef4 100644 --- a/IOT/config.ini +++ b/IOT/config.ini @@ -21,3 +21,5 @@ build_flags = -D EXAMPLE_NUMBER=69 + -D TRASHCAN_ONE=\"gdnuxl0wlgurtj3\" + diff --git a/IOT/include/Program.h b/IOT/include/Program.h index 03e3115..549809b 100644 --- a/IOT/include/Program.h +++ b/IOT/include/Program.h @@ -3,6 +3,7 @@ #include #include +#include "API.h" class Program{ public: @@ -26,5 +27,11 @@ private: * */ Ultrasonic *ultrasonic; + + /** + * @brief Réference de l'API pour les calls + * + */ + API *api; }; #endif \ No newline at end of file diff --git a/IOT/src/Program.cpp b/IOT/src/Program.cpp index 1f87003..710d302 100644 --- a/IOT/src/Program.cpp +++ b/IOT/src/Program.cpp @@ -1,10 +1,13 @@ #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); } @@ -12,7 +15,8 @@ Program::Program(){ 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(1000); + delay(10000); } \ No newline at end of file diff --git a/IOT/test/test_api.cpp b/IOT/test/test_api.cpp index 7b0cd6b..19bb5d9 100644 --- a/IOT/test/test_api.cpp +++ b/IOT/test/test_api.cpp @@ -45,5 +45,4 @@ void TestSendValue() { Serial1.begin(MONITOR_SPEED); api->wifiBegin(WIFI_SSID, WIFI_PASSWORD, &Serial1); TEST_ASSERT_EQUAL_MESSAGE(true, api->sendValue("30", "gdnuxl0wlgurtj3", "W", true), "Not Connected to server"); -} - +} \ No newline at end of file