zstack reporting configuration fix

vasyna · May 22, 2023 · a61f66b · a61f66b
1 parent a397a4e
commit a61f66b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/controller.h b/controller.h
@@ -1,7 +1,7 @@
 #ifndef CONTROLLER_H
 #define CONTROLLER_H
 
-#define SERVICE_VERSION                 "3.3.0"
+#define SERVICE_VERSION                 "3.3.1"
 #define UPDATE_AVAILABILITY_INTERVAL    10000
 
 #include "homed.h"

diff --git a/zigbee.cpp b/zigbee.cpp
@@ -557,14 +557,15 @@ void ZigBee::interviewError(const Device &device, const QString &reason)
 bool ZigBee::bindRequest(const Device &device, quint8 endpointId, quint16 clusterId, const QByteArray &address, quint8 dstEndpointId, bool unbind)
 {
     m_adapter->setRequestAddress(device->ieeeAddress());
+    m_replyReceived = false;
 
     if (!m_adapter->bindRequest(m_requestId, device->networkAddress(), endpointId, clusterId, address, dstEndpointId, unbind))
     {
         logWarning << "Device" << device->name() << "endpoint" << QString::asprintf("0x%02x", endpointId) << "cluster" << QString::asprintf("0x%04x", clusterId) << (unbind ? "unbinding" : "binding") << "request aborted";
         return false;
     }
 
-    if (!m_adapter->waitForSignal(this, SIGNAL(replyReceived()), NETWORK_REQUEST_TIMEOUT))
+    if (!m_replyReceived && !m_adapter->waitForSignal(this, SIGNAL(replyReceived()), NETWORK_REQUEST_TIMEOUT))
     {
         logWarning << "Device" << device->name() << "endpoint" << QString::asprintf("0x%02x", endpointId) << "cluster" << QString::asprintf("0x%04x", clusterId) << (unbind ? "unbinding" : "binding") << "timed out";
         return false;
@@ -602,14 +603,15 @@ bool ZigBee::configureReporting(const Device &device, quint8 endpointId, const R
     }
 
     m_adapter->setRequestAddress(device->ieeeAddress());
+    m_replyReceived = false;
 
     if (!m_adapter->unicastRequest(m_requestId, device->networkAddress(), 0x01, endpointId, reporting->clusterId(), request))
     {
         logWarning << "Device" << device->name() << "endpoint" << QString::asprintf("0x%02x", endpointId) << reporting->name().toUtf8().constData() << "reporting configuration request aborted";
         return false;
     }
 
-    if (!m_adapter->waitForSignal(this, SIGNAL(replyReceived()), NETWORK_REQUEST_TIMEOUT))
+    if (!m_replyReceived && !m_adapter->waitForSignal(this, SIGNAL(replyReceived()), NETWORK_REQUEST_TIMEOUT))
     {
         logWarning << "Device" << device->name() << "endpoint" << QString::asprintf("0x%02x", endpointId) << reporting->name().toUtf8().constData() << "reporting configuration request timed out";
         return false;
@@ -1643,6 +1645,7 @@ void ZigBee::requestFinished(quint8 id, quint8 status)
     if (id == m_requestId)
     {
         m_requestStatus = status;
+        m_replyReceived = true;
         emit replyReceived();
     }
 

diff --git a/zigbee.h b/zigbee.h
@@ -142,7 +142,7 @@ class ZigBee : public QObject
 
     QMetaEnum m_events;
     quint8 m_requestId, m_requestStatus, m_interPanChannel;
-    bool m_interPanLock;
+    bool m_replyReceived, m_interPanLock;
 
     QString m_statusLedPin, m_blinkLedPin, m_otaUpgradeFile;
     bool m_debug;