From d77fc3edf3066a2faf39ee5524d31787d7506f20 Mon Sep 17 00:00:00 2001 From: Jose Date: Wed, 9 Apr 2025 10:14:46 +0200 Subject: [PATCH] Init commit --- hardware/include/README | 37 ------------------------------- hardware/include/json.hpp | 28 ++++++++++++++++++++++++ hardware/include/rest.hpp | 5 ++++- hardware/include/wifi.hpp | 4 ++-- hardware/lib/README | 46 --------------------------------------- hardware/src/json.cpp | 39 ++++++++++++++++++++++++++++++++- hardware/src/rest.cpp | 5 ++++- hardware/test/README | 11 ---------- 8 files changed, 76 insertions(+), 99 deletions(-) delete mode 100644 hardware/include/README delete mode 100644 hardware/lib/README delete mode 100644 hardware/test/README diff --git a/hardware/include/README b/hardware/include/README deleted file mode 100644 index 49819c0..0000000 --- a/hardware/include/README +++ /dev/null @@ -1,37 +0,0 @@ - -This directory is intended for project header files. - -A header file is a file containing C declarations and macro definitions -to be shared between several project source files. You request the use of a -header file in your project source file (C, C++, etc) located in `src` folder -by including it, with the C preprocessing directive `#include'. - -```src/main.c - -#include "header.h" - -int main (void) -{ - ... -} -``` - -Including a header file produces the same results as copying the header file -into each source file that needs it. Such copying would be time-consuming -and error-prone. With a header file, the related declarations appear -in only one place. If they need to be changed, they can be changed in one -place, and programs that include the header file will automatically use the -new version when next recompiled. The header file eliminates the labor of -finding and changing all the copies as well as the risk that a failure to -find one copy will result in inconsistencies within a program. - -In C, the convention is to give header files names that end with `.h'. - -Read more about using header files in official GCC documentation: - -* Include Syntax -* Include Operation -* Once-Only Headers -* Computed Includes - -https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/hardware/include/json.hpp b/hardware/include/json.hpp index e69de29..b79a9a3 100644 --- a/hardware/include/json.hpp +++ b/hardware/include/json.hpp @@ -0,0 +1,28 @@ +#include + +String serializeSensorValue ( + int sensorId, + int deviceId, + String sensorType, + String unit, + int sensorStatus, + float temperature, + float humidity, + float carbonMonoxide, + float lat, + float lon, + long timestamp +); + +String serializeActuatorStatus ( + +); + +String serializeDevice ( + +); + +void deserializeSensorValue ( + +); + diff --git a/hardware/include/rest.hpp b/hardware/include/rest.hpp index 2617b4f..41f6c46 100644 --- a/hardware/include/rest.hpp +++ b/hardware/include/rest.hpp @@ -1 +1,4 @@ -#include \ No newline at end of file +#include + +#define SERVER_IP "192.168.48.151" +#define SERVER_PORT 80 \ No newline at end of file diff --git a/hardware/include/wifi.hpp b/hardware/include/wifi.hpp index cf7ed35..1d7a7f1 100644 --- a/hardware/include/wifi.hpp +++ b/hardware/include/wifi.hpp @@ -1,7 +1,7 @@ #include #include -#define SSID "iPhone de Jose" -#define PASSWORD "bombardeenlaus" +#define SSID "Redmi Note 14 Pro 5G" +#define PASSWORD "aitv5949" int setup_wifi(); \ No newline at end of file diff --git a/hardware/lib/README b/hardware/lib/README deleted file mode 100644 index 9379397..0000000 --- a/hardware/lib/README +++ /dev/null @@ -1,46 +0,0 @@ - -This directory is intended for project specific (private) libraries. -PlatformIO will compile them to static libraries and link into the executable file. - -The source code of each library should be placed in a separate directory -("lib/your_library_name/[Code]"). - -For example, see the structure of the following example libraries `Foo` and `Bar`: - -|--lib -| | -| |--Bar -| | |--docs -| | |--examples -| | |--src -| | |- Bar.c -| | |- Bar.h -| | |- library.json (optional. for custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html -| | -| |--Foo -| | |- Foo.c -| | |- Foo.h -| | -| |- README --> THIS FILE -| -|- platformio.ini -|--src - |- main.c - -Example contents of `src/main.c` using Foo and Bar: -``` -#include -#include - -int main (void) -{ - ... -} - -``` - -The PlatformIO Library Dependency Finder will find automatically dependent -libraries by scanning project source files. - -More information about PlatformIO Library Dependency Finder -- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/hardware/src/json.cpp b/hardware/src/json.cpp index df2ffdf..862f7d2 100644 --- a/hardware/src/json.cpp +++ b/hardware/src/json.cpp @@ -1 +1,38 @@ -#include "json.hpp" \ No newline at end of file +#include "json.hpp" + +String response; + +String serializeSensorValue ( + int sensorId, + int deviceId, + String sensorType, + String unit, + int sensorStatus, + float temperature, + float humidity, + float carbonMonoxide, + float lat, + float lon, + long timestamp +) +{ + DynamicJsonDocument doc(2048); + + String output; + + doc["sensorId"] = sensorId; + doc["deviceId"] = deviceId; + doc["sensorType"] = sensorType; + doc["unit"] = unit; + doc["sesnsorStatuts"] = sensorStatus; + doc["temperature"] = temperature; + doc["humidity"] = humidity; + doc["carbonMonoxide"] = carbonMonoxide; + doc["lat"] = lat; + doc["lon"] = lon; + doc["timestamp"] = timestamp; + + serializeJson(doc, output); + Serial.println(output); + return output; +} \ No newline at end of file diff --git a/hardware/src/rest.cpp b/hardware/src/rest.cpp index f3b0775..50777ab 100644 --- a/hardware/src/rest.cpp +++ b/hardware/src/rest.cpp @@ -1 +1,4 @@ -#include "rest.hpp" \ No newline at end of file +#include "rest.hpp" + +RestClient client = RestClient(SERVER_IP, SERVER_PORT); + \ No newline at end of file diff --git a/hardware/test/README b/hardware/test/README deleted file mode 100644 index 9b1e87b..0000000 --- a/hardware/test/README +++ /dev/null @@ -1,11 +0,0 @@ - -This directory is intended for PlatformIO Test Runner and project tests. - -Unit Testing is a software testing method by which individual units of -source code, sets of one or more MCU program modules together with associated -control data, usage procedures, and operating procedures, are tested to -determine whether they are fit for use. Unit testing finds problems early -in the development cycle. - -More information about PlatformIO Unit Testing: -- https://docs.platformio.org/en/latest/advanced/unit-testing/index.html