From 0814624216eb8176285d420879e2659459da5684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@guh.io>
Date: Mon, 16 Nov 2020 07:54:45 +0100
Subject: [PATCH] Add bind group to ZDO

---
 libnymea-zigbee/zdo/zigbeedeviceobject.cpp | 51 ++++++++++++++++++++++
 libnymea-zigbee/zdo/zigbeedeviceobject.h   |  3 +-
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/libnymea-zigbee/zdo/zigbeedeviceobject.cpp b/libnymea-zigbee/zdo/zigbeedeviceobject.cpp
index cf638b0..7d04e41 100644
--- a/libnymea-zigbee/zdo/zigbeedeviceobject.cpp
+++ b/libnymea-zigbee/zdo/zigbeedeviceobject.cpp
@@ -225,6 +225,57 @@ ZigbeeDeviceObjectReply *ZigbeeDeviceObject::requestSimpleDescriptor(quint8 endp
     return zdoReply;
 }
 
+ZigbeeDeviceObjectReply *ZigbeeDeviceObject::requestBindShortAddress(quint8 sourceEndpointId, quint16 clusterId, quint16 destinationAddress)
+{
+    qCDebug(dcZigbeeDeviceObject()) << "Request bind short address from" << m_node << "endpoint" << clusterId << "to" << destinationAddress;
+
+    // Build APS request
+    ZigbeeNetworkRequest request = buildZdoRequest(ZigbeeDeviceProfile::BindRequest);
+
+    // Generate a new transaction sequence number for this device object
+    quint8 transactionSequenceNumber = m_transactionSequenceNumber++;
+
+    // Build ZDO frame
+    QByteArray asdu;
+    QDataStream stream(&asdu, QIODevice::WriteOnly);
+    stream.setByteOrder(QDataStream::LittleEndian);
+    stream << transactionSequenceNumber;
+    stream << m_node->extendedAddress().toUInt64();
+    stream << sourceEndpointId;
+    stream << clusterId;
+    stream << static_cast<quint8>(Zigbee::DestinationAddressModeGroup);
+    stream << destinationAddress;
+
+    // Set the ZDO frame as APS request payload
+    request.setAsdu(asdu);
+
+    // Create the device object reply and wait for the response indication
+    ZigbeeDeviceObjectReply *zdoReply = createZigbeeDeviceObjectReply(request, transactionSequenceNumber);
+
+    // Send the request, on finished read the confirm information
+    ZigbeeNetworkReply *networkReply = m_network->sendRequest(request);
+    connect(networkReply, &ZigbeeNetworkReply::finished, this, [this, networkReply, zdoReply](){
+        if (!verifyNetworkError(zdoReply, networkReply)) {
+            qCWarning(dcZigbeeDeviceObject()) << "Failed to send request"
+                                              << static_cast<ZigbeeDeviceProfile::ZdoCommand>(networkReply->request().clusterId())
+                                              << m_node << networkReply->error()
+                                              << networkReply->zigbeeApsStatus();
+            finishZdoReply(zdoReply);
+            return;
+        }
+
+        // The request was successfully sent to the device
+        // Now check if the expected indication response received already
+        if (zdoReply->isComplete()) {
+            finishZdoReply(zdoReply);
+            return;
+        }
+        // We received the confirmation but not yet the indication
+    });
+
+    return zdoReply;
+}
+
 ZigbeeDeviceObjectReply *ZigbeeDeviceObject::requestBindIeeeAddress(quint8 sourceEndpointId, quint16 clusterId, const ZigbeeAddress &destinationIeeeAddress, quint8 destinationEndpointId)
 {
     qCDebug(dcZigbeeDeviceObject()) << "Request bind ieee address from" << m_node << "endpoint" << clusterId << "to" << destinationIeeeAddress.toString() << destinationEndpointId;
diff --git a/libnymea-zigbee/zdo/zigbeedeviceobject.h b/libnymea-zigbee/zdo/zigbeedeviceobject.h
index 42cc681..08d175f 100644
--- a/libnymea-zigbee/zdo/zigbeedeviceobject.h
+++ b/libnymea-zigbee/zdo/zigbeedeviceobject.h
@@ -50,8 +50,7 @@ public:
     // TODO: implement other device and service discovery methods
 
     // End device binding
-//    ZigbeeDeviceObjectReply *requestBindGroup(quint16 clusterId, quint16 groupAddress, quint8 destinationEndpoint);
-//    ZigbeeDeviceObjectReply *requestBindShortAddress();
+    ZigbeeDeviceObjectReply *requestBindShortAddress(quint8 sourceEndpointId, quint16 clusterId, quint16 destinationAddress);
     ZigbeeDeviceObjectReply *requestBindIeeeAddress(quint8 sourceEndpointId, quint16 clusterId, const ZigbeeAddress &destinationIeeeAddress, quint8 destinationEndpointId);