ETM-Schurig
/
nymea-zigbee
mirror of https://github.com/nymea/nymea-zigbee
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #46: Fix permit joining duration/remaining signals

pull/52/head
jenkins 2022-04-25 23:53:20 +02:00
parent 6de3c8318d 4f63ae01c0
commit ed87b53d50
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libnymea-zigbee/zigbeenetwork.cpp
View File

@ -48,8 +48,6 @@ ZigbeeNetwork::ZigbeeNetwork(const QUuid &networkUuid, QObject *parent) :
if (m_permitJoiningRemaining <= 0) {
m_permitJoinTimer->stop();
setPermitJoining(0);
} else {
setPermitJoiningState(m_permitJoiningRemaining, m_permitJoiningRemaining);
}
});
@ -491,11 +489,13 @@ void ZigbeeNetwork::setPermitJoiningState(bool permitJoiningEnabled, quint8 dura
emit permitJoinDurationChanged(duration);
}
m_permitJoiningRemaining = duration;
emit permitJoinRemainingChanged(m_permitJoiningRemaining);
m_permitJoinTimer->start();
} else {
m_permitJoiningDuration = 0;
emit permitJoinDurationChanged(0);
m_permitJoiningRemaining = 0;
emit permitJoinRemainingChanged(0);
m_permitJoinTimer->stop();
}

6
libnymea-zigbee/zigbeenetwork.h
View File

@ -245,11 +245,15 @@ signals:
void nodeAdded(ZigbeeNode *node);
void nodeRemoved(ZigbeeNode *node);
// Will be emited when a node joined and starts initializing
// Will be emitted when a node joined and starts initializing
void nodeJoined(ZigbeeNode *node);
void permitJoiningEnabledChanged(bool permitJoiningEnabled);
void permitJoinDurationChanged(quint8 duration);
// Will be emitted when the remaining duration changes in an unexpected
// manner. That means, it will not be emitted repeatedly every second,
// despite calling permitJoinRemainining() returning updated values,
// but it will be emitted for instance when it restarts or is aborted.
void permitJoinRemainingChanged(quint8 remaining);
void errorOccured(Error error);