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

cleanUp persistance of command topics (update libs

Browse Source
This commit is contained in:
Andrey Klimov
2022-02-13 18:47:40 +03:00
parent fc8b04ac9b
commit d30591d9f7
2 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lighthub/main.cpp
View File

@@ -388,12 +388,30 @@ void mqttCallback(char *topic, byte *payload, unsigned int length)
char * subItem = NULL;
// in Retaining status - trying to restore previous state from retained output topic. Retained input topics are not relevant.
if (lanStatus == RETAINING_COLLECTING) pfxlen=inTopic(topic,T_OUT);
if (lanStatus == RETAINING_COLLECTING)
{
pfxlen=inTopic(topic,T_OUT);
if (!pfxlen) // There is not status topic
{
if (mqttClient.isRetained())
{
pfxlen=inTopic(topic,T_BCST);
if (!pfxlen) pfxlen = inTopic(topic,T_DEV);
if (!pfxlen) return; // Not command topic ever
itemName=topic+pfxlen;
if (itemName[0]=='$') return;// -6; //Skipping homie stuff
debugSerial<<F("CleanUp retained topic ")<<topic<<endl;
mqttClient.deleteTopic(topic);
}
return;
}
}
else
{
pfxlen=inTopic(topic,T_BCST);
if (!pfxlen) pfxlen = inTopic(topic,T_DEV);
}
if (!pfxlen) {
debugSerial<<F("Skipping..")<<endl;
return;// -3;
@@ -406,29 +424,17 @@ else
cmd_parse((char *)payload);
return;// -4;
}
/*
if (subItem = strchr(itemName, '/'))
{
*subItem = 0;
subItem++;
if (*subItem=='$') return;// -5; //Skipping homie stuff
}
if (itemName[0]=='$') return;// -6; //Skipping homie stuff
Item item(itemName);
if (item.isValid()) {
//return
item.Ctrl((char *)payload,subItem);
} //valid item
*/
if (itemName[0]=='$') return;// -6; //Skipping homie stuff
//debugSerial<<F("itemName ")<<itemName<<endl;
Item item(itemName);
if (item.isValid()) item.Ctrl((char *)payload);
// else debugSerial<<F("item invalid")<<endl;
if (lanStatus != RETAINING_COLLECTING && (mqttClient.isRetained()))
{
debugSerial<<F("CleanUp retained topic ")<<topic<<endl;
mqttClient.deleteTopic(topic);
}
return;// -7;
}