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

MQTT topics config & CallBack refactoring

Browse Source
This commit is contained in:
Andrey Klimov
2019-03-04 04:49:35 +03:00
parent 23e493097e
commit 141bb9c657
13 changed files with 258 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lighthub/item.cpp
View File

@@ -42,7 +42,7 @@ extern aJsonObject *pollingItem;
extern PubSubClient mqttClient;
//extern char outprefix[];
const char outprefix[] PROGMEM = OUTTOPIC;
//const char outprefix[] PROGMEM = OUTTOPIC;
static unsigned long lastctrl = 0;
static aJsonObject *lastobj = NULL;
@@ -884,7 +884,9 @@ int Item::checkFM() {
char *outch;
char addrstr[32];
strcpy_P(addrstr, outprefix);
//strcpy_P(addrstr, outprefix);
setTopic(addrstr,sizeof(addrstr),T_OUT);
strncat(addrstr, itemArr->name, sizeof(addrstr) - 1);
strncat(addrstr, "_stat", sizeof(addrstr) - 1);
@@ -1164,7 +1166,9 @@ int Item::SendStatus(short cmd, short n, int *Par, boolean deffered) {
//char addrbuf[17];
char valstr[16] = "";
strcpy_P(addrstr, outprefix);
//strcpy_P(addrstr, outprefix);
setTopic(addrstr,sizeof(addrstr),T_OUT);
strncat(addrstr, itemArr->name, sizeof(addrstr));