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

Merge PR #520: Fixes in permit joining timer handling

Browse Source
This commit is contained in:
jenkins 2022-05-03 23:27:18 +02:00
commit 569e9fa57d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libnymea-core/zigbee/zigbeemanager.cpp
View File

@ -232,10 +232,6 @@ ZigbeeManager::ZigbeeError ZigbeeManager::setZigbeeNetworkPermitJoin(const QUuid
qCDebug(dcZigbee()) << "Set permit joining in network" << network << "to" << duration << "seconds" << ZigbeeUtils::convertUint16ToHexString(shortAddress); qCDebug(dcZigbee()) << "Set permit joining in network" << network << "to" << duration << "seconds" << ZigbeeUtils::convertUint16ToHexString(shortAddress);
network->setPermitJoining(duration, shortAddress); network->setPermitJoining(duration, shortAddress);
// Notify all clients about the new configuration
emit zigbeeNetworkChanged(network);
return ZigbeeManager::ZigbeeErrorNoError; return ZigbeeManager::ZigbeeErrorNoError;
} }
@ -505,6 +501,16 @@ void ZigbeeManager::addNetwork(ZigbeeNetwork *network)
emit zigbeeNetworkChanged(network); emit zigbeeNetworkChanged(network);
}); });
connect(network, &ZigbeeNetwork::permitJoinDurationChanged, this, [this, network](bool permitJoinDuration){
qCDebug(dcZigbee()) << "Network permit join duration changed" << network->networkUuid().toString() << permitJoinDuration;
emit zigbeeNetworkChanged(network);
});
connect(network, &ZigbeeNetwork::permitJoinRemainingChanged, this, [this, network](bool permitJoinRemaining){
qCDebug(dcZigbee()) << "Network permit join remaining changed" << network->networkUuid().toString() << permitJoinRemaining;
emit zigbeeNetworkChanged(network);
});
connect(network, &ZigbeeNetwork::nodeAdded, this, [this, network](ZigbeeNode *node){ connect(network, &ZigbeeNetwork::nodeAdded, this, [this, network](ZigbeeNode *node){
qCDebug(dcZigbee()) << "Node added to" << network << node; qCDebug(dcZigbee()) << "Node added to" << network << node;
// The plugin don't need to see the coordinator node // The plugin don't need to see the coordinator node