ETM-Schurig/powersync-zigbee
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #25: Remove a duplicate debug print and fix some typos

Browse Source
This commit is contained in:
Jenkins nymea 2021-12-11 00:30:26 +01:00
commit 6e912af594
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnymea-zigbee/backends/deconz/zigbeenetworkdeconz.cpp
View File

@ -70,7 +70,7 @@ ZigbeeNetworkReply *ZigbeeNetworkDeconz::sendRequest(const ZigbeeNetworkRequest
m_pendingReplies.remove(request.requestId()); m_pendingReplies.remove(request.requestId());
}); });
// Finish the reply right the way if the network is offline // Finish the reply right away if the network is offline
if (!m_controller->available() || state() == ZigbeeNetwork::StateOffline) { if (!m_controller->available() || state() == ZigbeeNetwork::StateOffline) {
finishNetworkReply(reply, ZigbeeNetworkReply::ErrorNetworkOffline); finishNetworkReply(reply, ZigbeeNetworkReply::ErrorNetworkOffline);
return reply; return reply;

2
libnymea-zigbee/backends/nxp/zigbeenetworknxp.cpp
View File

@ -92,7 +92,7 @@ ZigbeeNetworkReply *ZigbeeNetworkNxp::sendRequest(const ZigbeeNetworkRequest &re
//qCWarning(dcZigbeeNetwork()) << "#### Removed network reply" << reply << "ID:" << requestId << "Current reply count" << m_pendingReplies.count(); //qCWarning(dcZigbeeNetwork()) << "#### Removed network reply" << reply << "ID:" << requestId << "Current reply count" << m_pendingReplies.count();
}); });
// Finish the reply right the way if the network is offline // Finish the reply right away if the network is offline
if (!m_controller->available() || state() == ZigbeeNetwork::StateOffline) { if (!m_controller->available() || state() == ZigbeeNetwork::StateOffline) {
finishReplyInternally(reply, ZigbeeNetworkReply::ErrorNetworkOffline); finishReplyInternally(reply, ZigbeeNetworkReply::ErrorNetworkOffline);
return reply; return reply;

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

@ -311,7 +311,7 @@ ZigbeeDeviceObjectReply *ZigbeeDeviceObject::requestSimpleDescriptor(quint8 endp
ZigbeeDeviceObjectReply *ZigbeeDeviceObject::requestBindGroupAddress(quint8 sourceEndpointId, quint16 clusterId, quint16 destinationAddress) ZigbeeDeviceObjectReply *ZigbeeDeviceObject::requestBindGroupAddress(quint8 sourceEndpointId, quint16 clusterId, quint16 destinationAddress)
{ {
qCDebug(dcZigbeeDeviceObject()) << "Request bind group address from" << m_node << "endpoint" << ZigbeeUtils::convertByteToHexString(sourceEndpointId) qCDebug(dcZigbeeDeviceObject()) << "Requesting bind group address from" << m_node << "endpoint" << ZigbeeUtils::convertByteToHexString(sourceEndpointId)
<< static_cast<ZigbeeClusterLibrary::ClusterId>(clusterId) << "to group" << ZigbeeUtils::convertUint16ToHexString(destinationAddress); << static_cast<ZigbeeClusterLibrary::ClusterId>(clusterId) << "to group" << ZigbeeUtils::convertUint16ToHexString(destinationAddress);
// Build APS request // Build APS request

1
libnymea-zigbee/zigbeenetwork.cpp
View File

@ -887,7 +887,6 @@ void ZigbeeNetwork::setReplyResponseError(ZigbeeNetworkReply *reply, quint8 zigb
void ZigbeeNetwork::finishNetworkReply(ZigbeeNetworkReply *reply, ZigbeeNetworkReply::Error error) void ZigbeeNetwork::finishNetworkReply(ZigbeeNetworkReply *reply, ZigbeeNetworkReply::Error error)
{ {
qCDebug(dcZigbeeNetwork()) << "Finish network reply" << reply << error;
reply->m_error = error; reply->m_error = error;
switch(reply->error()) { switch(reply->error()) {
case ZigbeeNetworkReply::ErrorNoError: case ZigbeeNetworkReply::ErrorNoError: