andry/lighthub
1
0
Fork 0
mirror of https://github.com/anklimov/lighthub synced 2025-12-06 19:59:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Andrey Klimov
2019-02-14 18:18:49 +03:00
parent 5b5e5e9010
commit 3e3b5f9f5f
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lighthub/main.cpp
View File

@@ -362,21 +362,25 @@ void onMQTTConnect(){
// High level homie topics publishing // High level homie topics publishing
strncpy_P(topic, outprefix, sizeof(topic)); strncpy_P(topic, outprefix, sizeof(topic));
strncat_P(topic, state_P, sizeof(topic)); strncat_P(topic, state_P, sizeof(topic));
mqttClient.publish_P(topic,ready_P,true); strncpy_P(buf, ready_P, sizeof(buf));
mqttClient.publish(topic,buf,true);
strncpy_P(topic, outprefix, sizeof(topic)); strncpy_P(topic, outprefix, sizeof(topic));
strncat_P(topic, name_P, sizeof(topic)); strncat_P(topic, name_P, sizeof(topic));
mqttClient.publish_P(topic,nameval_P,true); strncpy_P(buf, nameval_P, sizeof(buf));
mqttClient.publish(topic,buf,true);
strncpy_P(topic, outprefix, sizeof(topic)); strncpy_P(topic, outprefix, sizeof(topic));
strncat_P(topic, stats_P, sizeof(topic)); strncat_P(topic, stats_P, sizeof(topic));
mqttClient.publish_P(topic,statsval_P,true); strncpy_P(buf, statsval_P, sizeof(buf));
mqttClient.publish(topic,buf,true);
#ifndef NO_HOMIE #ifndef NO_HOMIE
strncpy_P(topic, outprefix, sizeof(topic)); strncpy_P(topic, outprefix, sizeof(topic));
strncat_P(topic, homie_P, sizeof(topic)); strncat_P(topic, homie_P, sizeof(topic));
mqttClient.publish_P(topic,homiever_P,true); strncpy_P(buf, homiever_P, sizeof(buf));
mqttClient.publish(topic,buf,true);
if (items) { if (items) {
char datatype[32]="\0"; char datatype[32]="\0";
@@ -390,10 +394,11 @@ void onMQTTConnect(){
switch ( aJson.getArrayItem(item, I_TYPE)->valueint) { switch ( aJson.getArrayItem(item, I_TYPE)->valueint) {
case CH_THERMO: case CH_THERMO:
strncpy_P(datatype,float_P,sizeof(datatype)); strncpy_P(datatype,float_P,sizeof(datatype));
format[0]="\0"; format[0]=0;
break; break;
case CH_RELAY: case CH_RELAY:
case CH_GROUP:
strncpy_P(datatype,enum_P,sizeof(datatype)); strncpy_P(datatype,enum_P,sizeof(datatype));
strncpy_P(format,enumformat_P,sizeof(format)); strncpy_P(format,enumformat_P,sizeof(format));
break; break;
@@ -419,7 +424,7 @@ void onMQTTConnect(){
strncat_P(topic,datatype_P,sizeof(topic)); strncat_P(topic,datatype_P,sizeof(topic));
mqttClient.publish(topic,datatype,true); mqttClient.publish(topic,datatype,true);
if (strlen(format)) if (format[0])
{ {
strncpy_P(topic, outprefix, sizeof(topic)); strncpy_P(topic, outprefix, sizeof(topic));
strncat(topic,item->name,sizeof(topic)); strncat(topic,item->name,sizeof(topic));