jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-26 04:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Publish sensor data to state/sensors

Browse Source
This commit is contained in:
fvanroie 2021-08-01 23:28:12 +02:00
parent 26e7b80a4b
commit cdccb1f30d
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/hasp/hasp_dispatch.cpp
View File

@ -893,7 +893,7 @@ void dispatch_reboot(bool saveConfig)
/******************************************* Command Wrapper Functions *********************************/ /******************************************* Command Wrapper Functions *********************************/
// Periodically publish a JSON string indicating system status // Periodically publish a JSON string indicating sensor status
void dispatch_send_sensordata(const char*, const char*, uint8_t source) void dispatch_send_sensordata(const char*, const char*, uint8_t source)
{ {
#if HASP_USE_MQTT > 0 #if HASP_USE_MQTT > 0
@ -938,12 +938,12 @@ void dispatch_send_sensordata(const char*, const char*, uint8_t source)
char data[1024]; char data[1024];
size_t len = serializeJson(doc, data); size_t len = serializeJson(doc, data);
switch(mqtt_send_discovery(data, len)) { switch(mqtt_send_state(MQTT_TOPIC_SENSORS, data)) {
case MQTT_ERR_OK: case MQTT_ERR_OK:
LOG_TRACE(TAG_MQTT_PUB, F(MQTT_TOPIC_DISCOVERY " => %s"), data); LOG_TRACE(TAG_MQTT_PUB, F(MQTT_TOPIC_SENSORS " => %s"), data);
break; break;
case MQTT_ERR_PUB_FAIL: case MQTT_ERR_PUB_FAIL:
LOG_ERROR(TAG_MQTT_PUB, F(D_MQTT_FAILED " " MQTT_TOPIC_DISCOVERY " => %s"), data); LOG_ERROR(TAG_MQTT_PUB, F(D_MQTT_FAILED " " MQTT_TOPIC_SENSORS " => %s"), data);
break; break;
case MQTT_ERR_NO_CONN: case MQTT_ERR_NO_CONN:
LOG_ERROR(TAG_MQTT, F(D_MQTT_NOT_CONNECTED)); LOG_ERROR(TAG_MQTT, F(D_MQTT_NOT_CONNECTED));
@ -955,7 +955,7 @@ void dispatch_send_sensordata(const char*, const char*, uint8_t source)
#endif #endif
} }
// Periodically publish a JSON string indicating system status // Periodically publish a JSON string facilitating plate discovery
void dispatch_send_discovery(const char*, const char*, uint8_t source) void dispatch_send_discovery(const char*, const char*, uint8_t source)
{ {
#if HASP_USE_MQTT > 0 #if HASP_USE_MQTT > 0
@ -1183,7 +1183,8 @@ void dispatch_exec(const char*, const char* payload, uint8_t source)
cmdfile.seek(0); cmdfile.seek(0);
while(bufferedFile.available()) { while(bufferedFile.available()) {
size_t index = 0; buffer=""; size_t index = 0;
buffer = "";
// while(index < sizeof(buffer) - 1) { // while(index < sizeof(buffer) - 1) {
while(index < MQTT_MAX_PACKET_SIZE) { while(index < MQTT_MAX_PACKET_SIZE) {
int c = bufferedFile.read(); int c = bufferedFile.read();

4
src/mqtt/hasp_mqtt.h
View File

@ -68,6 +68,10 @@ bool mqttSetConfig(const JsonObject& settings);
#define MQTT_TOPIC_BROADCAST "broadcast" #define MQTT_TOPIC_BROADCAST "broadcast"
#endif #endif
#ifndef MQTT_TOPIC_SENSORS
#define MQTT_TOPIC_SENSORS "sensors"
#endif
#define MQTT_TOPIC_LWT "LWT" #define MQTT_TOPIC_LWT "LWT"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////