From 9782ad5eaca7c16da122878502b1ef4c70af2d47 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sat, 6 Nov 2021 15:47:29 +0100 Subject: [PATCH] Remove a duplicate debug print and fix some typos --- libnymea-zigbee/backends/deconz/zigbeenetworkdeconz.cpp | 2 +- libnymea-zigbee/backends/nxp/zigbeenetworknxp.cpp | 2 +- libnymea-zigbee/zdo/zigbeedeviceobject.cpp | 2 +- libnymea-zigbee/zigbeenetwork.cpp | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libnymea-zigbee/backends/deconz/zigbeenetworkdeconz.cpp b/libnymea-zigbee/backends/deconz/zigbeenetworkdeconz.cpp index 3748055..866c645 100644 --- a/libnymea-zigbee/backends/deconz/zigbeenetworkdeconz.cpp +++ b/libnymea-zigbee/backends/deconz/zigbeenetworkdeconz.cpp @@ -70,7 +70,7 @@ ZigbeeNetworkReply *ZigbeeNetworkDeconz::sendRequest(const ZigbeeNetworkRequest 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) { finishNetworkReply(reply, ZigbeeNetworkReply::ErrorNetworkOffline); return reply; diff --git a/libnymea-zigbee/backends/nxp/zigbeenetworknxp.cpp b/libnymea-zigbee/backends/nxp/zigbeenetworknxp.cpp index 3d81bbc..af0f17e 100644 --- a/libnymea-zigbee/backends/nxp/zigbeenetworknxp.cpp +++ b/libnymea-zigbee/backends/nxp/zigbeenetworknxp.cpp @@ -92,7 +92,7 @@ ZigbeeNetworkReply *ZigbeeNetworkNxp::sendRequest(const ZigbeeNetworkRequest &re //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) { finishReplyInternally(reply, ZigbeeNetworkReply::ErrorNetworkOffline); return reply; diff --git a/libnymea-zigbee/zdo/zigbeedeviceobject.cpp b/libnymea-zigbee/zdo/zigbeedeviceobject.cpp index 1efd4ff..3e5f98c 100644 --- a/libnymea-zigbee/zdo/zigbeedeviceobject.cpp +++ b/libnymea-zigbee/zdo/zigbeedeviceobject.cpp @@ -311,7 +311,7 @@ ZigbeeDeviceObjectReply *ZigbeeDeviceObject::requestSimpleDescriptor(quint8 endp 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(clusterId) << "to group" << ZigbeeUtils::convertUint16ToHexString(destinationAddress); // Build APS request diff --git a/libnymea-zigbee/zigbeenetwork.cpp b/libnymea-zigbee/zigbeenetwork.cpp index 839ae0f..2c76c3c 100644 --- a/libnymea-zigbee/zigbeenetwork.cpp +++ b/libnymea-zigbee/zigbeenetwork.cpp @@ -887,7 +887,6 @@ void ZigbeeNetwork::setReplyResponseError(ZigbeeNetworkReply *reply, quint8 zigb void ZigbeeNetwork::finishNetworkReply(ZigbeeNetworkReply *reply, ZigbeeNetworkReply::Error error) { - qCDebug(dcZigbeeNetwork()) << "Finish network reply" << reply << error; reply->m_error = error; switch(reply->error()) { case ZigbeeNetworkReply::ErrorNoError: