From 72150b6bfb7a80dad1e08880356fb7e59f8de1ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@guh.io>
Date: Thu, 3 Dec 2020 10:44:31 +0100
Subject: [PATCH] Make use of TX options in the NXP backend and send permit
 join to short address broadcast, not group

---
 libnymea-zigbee/backends/nxp/zigbeebridgecontrollernxp.cpp | 6 +++---
 libnymea-zigbee/backends/nxp/zigbeenetworknxp.cpp          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libnymea-zigbee/backends/nxp/zigbeebridgecontrollernxp.cpp b/libnymea-zigbee/backends/nxp/zigbeebridgecontrollernxp.cpp
index 58cbd86..925bfc5 100644
--- a/libnymea-zigbee/backends/nxp/zigbeebridgecontrollernxp.cpp
+++ b/libnymea-zigbee/backends/nxp/zigbeebridgecontrollernxp.cpp
@@ -328,7 +328,7 @@ ZigbeeInterfaceNxpReply *ZigbeeBridgeControllerNxp::requestEnqueueSendDataGroup(
     payloadStream << profileId;
     payloadStream << clusterId;
     payloadStream << sourceEndpoint;
-    payloadStream << static_cast<quint8>(SecurityModeUnsecure);
+    payloadStream << static_cast<quint8>(txOptions);
     payloadStream << radius;
     payloadStream << static_cast<quint16>(asdu.size());
     for (int i = 0; i < asdu.size(); i++) {
@@ -364,7 +364,7 @@ ZigbeeInterfaceNxpReply *ZigbeeBridgeControllerNxp::requestEnqueueSendDataShortA
     payloadStream << profileId;
     payloadStream << clusterId;
     payloadStream << sourceEndpoint;
-    payloadStream << static_cast<quint8>(SecurityModeUnsecure);
+    payloadStream << static_cast<quint8>(txOptions);
     payloadStream << radius;
     payloadStream << static_cast<quint16>(asdu.size());
     for (int i = 0; i < asdu.size(); i++) {
@@ -400,7 +400,7 @@ ZigbeeInterfaceNxpReply *ZigbeeBridgeControllerNxp::requestEnqueueSendDataIeeeAd
     payloadStream << profileId;
     payloadStream << clusterId;
     payloadStream << sourceEndpoint;
-    payloadStream << static_cast<quint8>(SecurityModeUnsecure);
+    payloadStream << static_cast<quint8>(txOptions);
     payloadStream << radius;
     payloadStream << static_cast<quint16>(asdu.size());
     for (int i = 0; i < asdu.size(); i++) {
diff --git a/libnymea-zigbee/backends/nxp/zigbeenetworknxp.cpp b/libnymea-zigbee/backends/nxp/zigbeenetworknxp.cpp
index 2cf43cb..98854d9 100644
--- a/libnymea-zigbee/backends/nxp/zigbeenetworknxp.cpp
+++ b/libnymea-zigbee/backends/nxp/zigbeenetworknxp.cpp
@@ -225,12 +225,12 @@ ZigbeeNetworkReply *ZigbeeNetworkNxp::requestSetPermitJoin(quint16 shortAddress,
     // Get the power descriptor
     ZigbeeNetworkRequest request;
     request.setRequestId(generateSequenceNumber());
-    request.setDestinationAddressMode(Zigbee::DestinationAddressModeGroup);
+    request.setDestinationAddressMode(Zigbee::DestinationAddressModeShortAddress);
     request.setDestinationShortAddress(static_cast<quint16>(shortAddress));
     request.setProfileId(Zigbee::ZigbeeProfileDevice); // ZDP
     request.setClusterId(ZigbeeDeviceProfile::MgmtPermitJoinRequest);
     request.setSourceEndpoint(0); // ZDO
-    request.setRadius(0);
+    request.setRadius(10);
 
     // Build ASDU
     QByteArray asdu;