Zigbee2mqtt: fix false 200ms communication timeout

awawa-dev · Dec 30, 2024 · 789ace3 · 789ace3
1 parent 2ed4cd4
commit 789ace3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/sources/hyperhdr/HyperHdrDaemon.cpp b/sources/hyperhdr/HyperHdrDaemon.cpp
@@ -215,11 +215,6 @@ void HyperHdrDaemon::instanceStateChangedHandler(InstanceState state, quint8 ins
 				_flatProtoBuffersThread->start();
 			}
 
-			if (_mqttThread != nullptr && !_mqttThread->isRunning())
-			{
-				_mqttThread->start();
-			}
-
 			if (_networkThread != nullptr && !_networkThread->isRunning())
 			{
 				_networkThread->start();
@@ -401,6 +396,7 @@ void HyperHdrDaemon::startNetworkServices()
 		[_mqtt](QThread* mqttThread) {
 			THREAD_REMOVER(QString("MQTT"), mqttThread, _mqtt);
 		});
+	_mqttThread->start();
 #endif
 }
 

diff --git a/sources/led-drivers/net/DriverNetZigbee2mqtt.cpp b/sources/led-drivers/net/DriverNetZigbee2mqtt.cpp
@@ -65,7 +65,8 @@ bool DriverNetZigbee2mqtt::powerOnOff(bool isOn)
 
 	for (const auto& lamp : _zigInstance.lamps)
 	{
-		QString topic = QString("zigbee2mqtt/%1/set").arg(lamp.name);
+		QString topicDevice = QString("zigbee2mqtt/%1").arg(lamp.name);
+		QString topic = QString("%1/set").arg(topicDevice);
 		QJsonObject row;
 
 		row["state"] = (isOn) ? "ON" : "OFF";
@@ -75,12 +76,18 @@ bool DriverNetZigbee2mqtt::powerOnOff(bool isOn)
 
 		if (isOn)
 		{
+			emit GlobalSignals::getInstance()->SignalMqttSubscribe(true, topicDevice);
+
 			row["state"] = "OFF";
 			doc.setObject(row);
 
 			lastWill.push_back(topic);
 			lastWill.push_back(doc.toJson(QJsonDocument::Compact));
 		}
+		else
+		{
+			emit GlobalSignals::getInstance()->SignalMqttSubscribe(false, topicDevice);
+		}
 	}
 
 	if (_zigInstance.lamps.size() > 0)