ETM-Schurig
/
nymea-zigbee
mirror of https://github.com/nymea/nymea-zigbee
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #53: Explicitly stop the ZCL timeout timer

pull/56/head
jenkins 2022-06-07 23:06:19 +02:00
parent d8c74fd52e fd12d0518b
commit 0b92eb4968
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libnymea-zigbee/zcl/zigbeecluster.cpp
View File

@ -208,7 +208,7 @@ ZigbeeClusterReply *ZigbeeCluster::createClusterReply(const ZigbeeNetworkRequest
connect(zclReply, &ZigbeeClusterReply::finished, this, [this, zclReply](){
zclReply->deleteLater();
m_pendingReplies.remove(zclReply->transactionSequenceNumber());
}, Qt::QueuedConnection);
});
return zclReply;
}
@ -412,6 +412,7 @@ void ZigbeeCluster::finishZclReply(ZigbeeClusterReply *zclReply)
{
qCDebug(dcZigbeeCluster()) << "ZigbeeClusterReply finished" << zclReply->request() << zclReply->requestFrame() << zclReply->responseFrame();
// FIXME: Set the status
zclReply->m_timeoutTimer.stop();
emit zclReply->finished();
}

2
libnymea-zigbee/zdo/zigbeedeviceobject.cpp
View File

@ -661,7 +661,7 @@ ZigbeeDeviceObjectReply *ZigbeeDeviceObject::createZigbeeDeviceObjectReply(const
if (zdoReply->error() != ZigbeeDeviceObjectReply::ErrorNoError) {
qCWarning(dcZigbeeDeviceObject()) << "ZDO request error for TSN:" << transactionSequenceNumber;
}
}, Qt::QueuedConnection);
});
m_pendingReplies.insert(transactionSequenceNumber, zdoReply);
return zdoReply;
}