3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-06-09 14:11:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add MQTT parts (publish groups)

Browse source
This commit is contained in:
DanielR92 2024-03-30 12:12:00 +01:00
parent b8a1bb126f
commit 73b3542c16
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/plugins/zeroExport/zeroExport.h
View file

@ -504,11 +504,15 @@ class ZeroExport {
if (topic.indexOf("groups") != -1) { if (topic.indexOf("groups") != -1) {
String i = topic.substring(topic.length() - 10, topic.length() - 8); String i = topic.substring(topic.length() - 10, topic.length() - 8);
uint id = i.toInt(); uint id = i.toInt();
}
mCfg->groups[id].enabled = (bool)obj["val"];
}
else
{
mCfg->enabled = (bool)obj["val"]; mCfg->enabled = (bool)obj["val"];
mLog["zero_enable"] = mCfg->enabled; mLog["zero_enable"] = mCfg->enabled;
} }
}
mLog["Msg"] = obj; mLog["Msg"] = obj;
sendLog(); sendLog();
@ -1499,15 +1503,23 @@ class ZeroExport {
JsonObject obj = doc.to<JsonObject>(); JsonObject obj = doc.to<JsonObject>();
*doLog = true; *doLog = true;
String gr;
// Init // Init
if (!mIsSubscribed) { if (!mIsSubscribed) {
mIsSubscribed = true; mIsSubscribed = true;
mMqtt->publish("zero/set/enabled", ((mCfg->enabled) ? dict[STR_TRUE] : dict[STR_FALSE]), false); mMqtt->publish("zero/set/enabled", ((mCfg->enabled) ? dict[STR_TRUE] : dict[STR_FALSE]), false);
mMqtt->subscribe("zero/set/enabled", QOS_2); mMqtt->subscribe("zero/set/enabled", QOS_2);
gr = "zero/set/groups/" + String(group) + "/enabled";
mMqtt->publish(gr.c_str(), ((mCfg->groups[group].enabled) ? dict[STR_TRUE] : dict[STR_FALSE]) , false);
mMqtt->subscribe(gr.c_str(), QOS_2);
} }
mMqtt->publish("zero/state/enabled", ((mCfg->enabled) ? dict[STR_TRUE] : dict[STR_FALSE]), false); mMqtt->publish("zero/state/enabled", ((mCfg->enabled) ? dict[STR_TRUE] : dict[STR_FALSE]), false);
gr = "zero/state/groups/" + String(group) + "/enabled";
mMqtt->publish(gr.c_str(), ((mCfg->groups[group].enabled) ? dict[STR_TRUE] : dict[STR_FALSE]) , false);
// if (mCfg->groups[group].publishPower) { // if (mCfg->groups[group].publishPower) {
// mCfg->groups[group].publishPower = false; // mCfg->groups[group].publishPower = false;