Gallardo7761/contaminus
Archived
1
0
Fork 0
Code Pull Requests Activity

Refactor: update DEVICE_ROLE to ACTUATOR and adjust sensor serialization logic

Browse Source
This commit is contained in:
Jose
2025-06-04 00:21:38 +02:00
parent e30531729a
commit 97a17b926d
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/include/JsonTools.hpp
View File

@@ -11,6 +11,7 @@
#include "MAX7219.hpp" #include "MAX7219.hpp"
#endif #endif
#if DEVICE_ROLE == SENSOR
String serializeSensorValue( String serializeSensorValue(
int groupId, int groupId,
const String &deviceId, const String &deviceId,
@@ -20,6 +21,7 @@ String serializeSensorValue(
const BME280Data_t &bme, const BME280Data_t &bme,
const MQ7Data_t &mq7, const MQ7Data_t &mq7,
const GPSData_t &gps); const GPSData_t &gps);
#endif
#if DEVICE_ROLE == ACTUATOR #if DEVICE_ROLE == ACTUATOR
MAX7219Status_t deserializeActuatorStatus(HTTPClient &http, int httpResponseCode); MAX7219Status_t deserializeActuatorStatus(HTTPClient &http, int httpResponseCode);

2
hardware/include/globals.hpp
View File

@@ -2,7 +2,7 @@
#include <Arduino.h> #include <Arduino.h>
#define DEVICE_ROLE SENSOR // se cambia entre SENSOR y ACTUATOR #define DEVICE_ROLE ACTUATOR // se cambia entre SENSOR y ACTUATOR
#define MQTT_URI "miarma.net" #define MQTT_URI "miarma.net"
#define API_URI "https://contaminus.miarma.net/api/v1/" #define API_URI "https://contaminus.miarma.net/api/v1/"

2
hardware/src/lib/http/JsonTools.cpp
View File

@@ -1,5 +1,6 @@
#include "JsonTools.hpp" #include "JsonTools.hpp"
#if DEVICE_ROLE == SENSOR
String serializeSensorValue( String serializeSensorValue(
int groupId, int groupId,
const String &deviceId, const String &deviceId,
@@ -39,6 +40,7 @@ String serializeSensorValue(
#endif #endif
return output; return output;
} }
#endif
#if DEVICE_ROLE == ACTUATOR #if DEVICE_ROLE == ACTUATOR
MAX7219Status_t deserializeActuatorStatus(HTTPClient &http, int httpResponseCode) MAX7219Status_t deserializeActuatorStatus(HTTPClient &http, int httpResponseCode)