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

Merge PR #63: Fix permit joining in deconz backend

Browse Source
This commit is contained in:
jenkins 2022-09-23 16:33:18 +02:00
commit 32316dd43c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,12 +136,12 @@ ZigbeeNetworkReply *ZigbeeNetworkDeconz::requestSetPermitJoin(quint16 shortAddre
// Get the power descriptor // Get the power descriptor
ZigbeeNetworkRequest request; ZigbeeNetworkRequest request;
request.setRequestId(generateSequenceNumber()); request.setRequestId(generateSequenceNumber());
request.setDestinationAddressMode(Zigbee::DestinationAddressModeGroup); request.setDestinationAddressMode(Zigbee::DestinationAddressModeShortAddress);
request.setDestinationShortAddress(static_cast<quint16>(shortAddress)); request.setDestinationShortAddress(static_cast<quint16>(shortAddress));
request.setProfileId(Zigbee::ZigbeeProfileDevice); // ZDP request.setProfileId(Zigbee::ZigbeeProfileDevice); // ZDP
request.setClusterId(ZigbeeDeviceProfile::MgmtPermitJoinRequest); request.setClusterId(ZigbeeDeviceProfile::MgmtPermitJoinRequest);
request.setSourceEndpoint(0); // ZDO request.setSourceEndpoint(0); // ZDO
request.setRadius(10); request.setRadius(30);
// Build ASDU // Build ASDU
QByteArray asdu; QByteArray asdu;

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

@ -225,7 +225,7 @@ ZigbeeNetworkReply *ZigbeeNetworkNxp::requestSetPermitJoin(quint16 shortAddress,
request.setProfileId(Zigbee::ZigbeeProfileDevice); // ZDP request.setProfileId(Zigbee::ZigbeeProfileDevice); // ZDP
request.setClusterId(ZigbeeDeviceProfile::MgmtPermitJoinRequest); request.setClusterId(ZigbeeDeviceProfile::MgmtPermitJoinRequest);
request.setSourceEndpoint(0); // ZDO request.setSourceEndpoint(0); // ZDO
request.setRadius(10); request.setRadius(30);
// Build ASDU // Build ASDU
QByteArray asdu; QByteArray asdu;

4
libnymea-zigbee/backends/ti/zigbeebridgecontrollerti.cpp
View File

@ -672,8 +672,8 @@ ZigbeeInterfaceTiReply *ZigbeeBridgeControllerTi::addEndpointToGroup(quint8 endp
ZigbeeInterfaceTiReply *ZigbeeBridgeControllerTi::requestPermitJoin(quint8 seconds, const quint16 &networkAddress) ZigbeeInterfaceTiReply *ZigbeeBridgeControllerTi::requestPermitJoin(quint8 seconds, const quint16 &networkAddress)
{ {
NEW_PAYLOAD; NEW_PAYLOAD;
stream << static_cast<quint8>(networkAddress == 0 || networkAddress == 0xFFFC ? 0x0F : 0x02); stream << static_cast<quint8>(networkAddress == Zigbee::BroadcastAddressAllRouters ? 0x0F : 0x02);
stream << static_cast<quint16>(networkAddress == 0 ? 0xFFFC : networkAddress); stream << static_cast<quint16>(networkAddress);
stream << seconds; stream << seconds;
stream << static_cast<quint8>(0x00); // tcsignificance stream << static_cast<quint8>(0x00); // tcsignificance
ZigbeeInterfaceTiReply *reply = sendCommand(Ti::SubSystemZDO, Ti::ZDOCommandMgmtPermitJoinReq, payload); ZigbeeInterfaceTiReply *reply = sendCommand(Ti::SubSystemZDO, Ti::ZDOCommandMgmtPermitJoinReq, payload);