andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-11 02:09:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

check for max sensors - #327

Browse Source
This commit is contained in:
Paul
2020-02-17 11:13:41 +01:00
parent ce49b37a34
commit 0712ab5152
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ems-esp.cpp
View File

@@ -19,6 +19,7 @@
// Dallas external temp sensors // Dallas external temp sensors
#include "ds18.h" #include "ds18.h"
DS18 ds18; DS18 ds18;
#define DS18_MQTT_PAYLOAD_MAXSIZE 400
// public libraries // public libraries
#include <ArduinoJson.h> // https://github.com/bblanchon/ArduinoJson #include <ArduinoJson.h> // https://github.com/bblanchon/ArduinoJson
@@ -565,8 +566,13 @@ void publishSensorValues() {
return; // no sensors attached return; // no sensors attached
} }
StaticJsonDocument<400> doc; // each payload per sensor is 30 bytes so calculate if we have enough space
JsonObject sensors = doc.to<JsonObject>(); if ((EMSESP_Settings.dallas_sensors * 30) > DS18_MQTT_PAYLOAD_MAXSIZE) {
myDebug("Error: too many Dallas sensors for MQTT payload");
}
StaticJsonDocument<DS18_MQTT_PAYLOAD_MAXSIZE> doc;
JsonObject sensors = doc.to<JsonObject>();
bool hasdata = false; bool hasdata = false;
char buffer[128] = {0}; char buffer[128] = {0};
@@ -583,7 +589,7 @@ void publishSensorValues() {
return; // nothing to send return; // nothing to send
} }
char data[400] = {0}; char data[DS18_MQTT_PAYLOAD_MAXSIZE] = {0};
serializeJson(doc, data, sizeof(data)); serializeJson(doc, data, sizeof(data));
myDebugLog("Publishing external sensor data via MQTT"); myDebugLog("Publishing external sensor data via MQTT");
myESP.mqttPublish(TOPIC_EXTERNAL_SENSORS, data); myESP.mqttPublish(TOPIC_EXTERNAL_SENSORS, data);

3
src/my_config.h
View File

@@ -10,8 +10,9 @@
#include "ems.h" #include "ems.h"
// TOPICS with _CMD_ are used for receiving commands from an MQTT Broker // TOPICS with *_CMD_* are used for receiving commands from an MQTT Broker
// EMS-ESP will subscribe to these topics // EMS-ESP will subscribe to these topics
#define TOPIC_GENERIC_CMD "generic_cmd" // for receiving generic system commands via MQTT #define TOPIC_GENERIC_CMD "generic_cmd" // for receiving generic system commands via MQTT
// MQTT for thermostat // MQTT for thermostat