changed deviceId from Integer to String/CHAR(6)

hardware/include/BME280.hpp

@@ -1,3 +1,5 @@
+#pragma once
+
 #include <Wire.h>
 #include <BME280I2C.h>
 

hardware/include/GPS.hpp

@@ -1,3 +1,5 @@
+#pragma once
+
 #include "TinyGPSPlus.h"
 
 struct GPSData_t

hardware/include/JsonTools.hpp

@@ -1,46 +1,27 @@
+#pragma once
+
 #include <ArduinoJson.h>
 #include <HTTPClient.h>
 
-String serializeSensorValue (
+String serializeSensorValue(
     int sensorId,
-    int deviceId,
-    String sensorType,
-    String unit, 
+    const String &deviceId,
+    const String &sensorType,
+    const String &unit,
     int sensorStatus,
-    float temperature,
-    float humidity,
-    float carbonMonoxide,
-    float lat,
-    float lon,
+    const BME280Data_t &bme,
+    const MQ7Data_t &mq7,
+    const GPSData_t &gps,
     long timestamp
 );
 
-String serializeActuatorStatus (
-    int actuatorId, 
-    int deviceId, 
-    int status, 
+String serializeActuatorStatus(
+    int actuatorId,
+    const String &deviceId,
+    int status,
     long timestamp
 );
 
-String serializeDevice (
-    int sensorId, 
-    int deviceId, 
-    String sensorType, 
-    int status, 
-    long timestamp
-);
-
-void deserializeSensorValue (
-    HTTPClient &http,
-    int httpResponseCode
-);
-
-void deserializeActuatorStatus (
-    HTTPClient &http,
-    int httpResponseCode
-);
-
-void deserializeDevice (
-    HTTPClient &http,
-    int httpResponseCode
-);
+void deserializeSensorValue(HTTPClient &http, int httpResponseCode);
+void deserializeActuatorStatus(HTTPClient &http, int httpResponseCode);
+void deserializeDevice(HTTPClient &http, int httpResponseCode);

hardware/include/MAX7219.hpp

@@ -1,3 +1,5 @@
+#pragma once
+
 #include <MD_Parola.h>
 #include <MD_MAX72xx.h>
 #include <SPI.h>

hardware/include/MQ7v2.hpp

@@ -1,3 +1,5 @@
+#pragma once
+
 #include <Arduino.h>
 
 #define MQ7_A0 34

hardware/include/MqttClient.hpp

@@ -1,2 +1,4 @@
+#pragma once
+
 #include <WiFi.h>
 #include <PubSubClient.h>

hardware/include/RestClient.hpp

@@ -1,3 +1,5 @@
+#pragma once
+
 #include <HTTPClient.h>
 
 void getRequest(HTTPClient &httpClient, const String url, String &response);

hardware/include/WifiConnection.hpp

@@ -1,3 +1,5 @@
+#pragma once
+
 #include <WiFi.h>
 #include <PubSubClient.h>
 

hardware/include/main.hpp

@@ -20,7 +20,8 @@
 #include "MAX7219.hpp"
 #include "MQ7v2.hpp"
 
-struct TaskTimer {
+struct TaskTimer
+{
     uint32_t lastRun = 0;
     uint32_t interval = 1000;
 
@@ -30,7 +31,14 @@ struct TaskTimer {
         : lastRun(last), interval(interval) {}
 };
 
-enum AirQualityStatus {
+struct SensorInfo 
+{
+    int id;
+    String type;
+};
+
+enum AirQualityStatus
+{
     GOOD,
     BAD
 };