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

Finish zigbee network joining as first version

Browse Source
This commit is contained in:
Simon Stürz 2020-11-02 15:13:42 +01:00
parent 6edf6977a4
commit cdf8b171f9
3 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libnymea-core/jsonrpc/zigbeehandler.cpp
View File

@ -60,7 +60,9 @@ ZigbeeHandler::ZigbeeHandler(ZigbeeManager *zigbeeManager, QObject *parent) :
zigbeeNetworkDescription.insert("panId", enumValueName(Uint));
zigbeeNetworkDescription.insert("channel", enumValueName(Uint));
zigbeeNetworkDescription.insert("channelMask", enumValueName(Uint));
zigbeeNetworkDescription.insert("permitJoin", enumValueName(Bool));
zigbeeNetworkDescription.insert("permitJoinEnabled", enumValueName(Bool));
zigbeeNetworkDescription.insert("permitJoinDuration", enumValueName(Uint));
zigbeeNetworkDescription.insert("permitJoinRemaining", enumValueName(Uint));
zigbeeNetworkDescription.insert("backendType", enumRef<ZigbeeAdapter::ZigbeeBackendType>());
zigbeeNetworkDescription.insert("networkState", enumRef<ZigbeeManager::ZigbeeNetworkState>());
registerObject("ZigbeeNetwork", zigbeeNetworkDescription);
@ -145,12 +147,15 @@ ZigbeeHandler::ZigbeeHandler(ZigbeeManager *zigbeeManager, QObject *parent) :
// SetPermitJoin
params.clear(); returns.clear();
description = "Allow or deny nodes to join the network with the given networkUuid for a specific duration in seconds. "
"The duration values has to be between 0 and 255 seconds. The permitJoinDuration indicates how long permit "
"has been enabled and the permitJoinDuration indicates the rest of the time. Those values can be used to "
"show a countdown or progressbar. This method can be recalled for resetting the timeout. "
"If the duration is set to 0 seconds, joining will be disabled immediatly for the entire network. "
"The shortAddress is optional and defaults to the broadcast address (0xfffc) for all routers in the network. "
"If the short address matches the address of a router node in the network, only that router will "
"be able to allow new nodes to join the network. A new node will join to the router with the best LQI.";
"be able to allow new nodes to join the network. A new node will join to the router with the best link quality index (LQI).";
params.insert("networkUuid", enumValueName(Uuid));
params.insert("timeout", enumValueName(Uint));
params.insert("duration", enumValueName(Uint));
params.insert("o:shortAddress", enumValueName(Uint));
returns.insert("zigbeeError", enumRef<ZigbeeManager::ZigbeeError>());
registerMethod("SetPermitJoin", description, params, returns);
@ -270,7 +275,10 @@ QVariantMap ZigbeeHandler::packNetwork(ZigbeeNetwork *network)
networkMap.insert("panId", network->panId());
networkMap.insert("channel", network->channel());
networkMap.insert("channelMask", network->channelMask().toUInt32());
networkMap.insert("permitJoin", network->permitJoining());
networkMap.insert("permitJoinEnabled", network->permitJoiningEnabled());
networkMap.insert("permitJoinDuration", network->permitJoiningDuration());
networkMap.insert("permitJoinRemaining", network->permitJoiningRemaining());
switch (network->backendType()) {
case Zigbee::ZigbeeBackendTypeDeconz:
networkMap.insert("backendType", enumValueName<ZigbeeAdapter::ZigbeeBackendType>(ZigbeeAdapter::ZigbeeBackendTypeDeconz));

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

@ -109,7 +109,7 @@ ZigbeeManager::ZigbeeError ZigbeeManager::createZigbeeNetwork(const ZigbeeAdapte
// Make sure we don't have aleardy a network for this adapter
foreach (ZigbeeNetwork *existingNetwork, m_zigbeeNetworks.values()) {
if (existingNetwork->serialPortName() == adapter.systemLocation()) {
qCWarning(dcZigbee()) << "Failed to create a network for" << adapter << "because this adapter is already in use for network" << existingNetwork->networkUuid().toString();
qCWarning(dcZigbee()) << "Failed to create a network for" << adapter << "because this adapter is already in use for network" << existingNetwork;
return ZigbeeManager::ZigbeeErrorAdapterAlreadyInUse;
}
}
@ -125,7 +125,7 @@ ZigbeeManager::ZigbeeError ZigbeeManager::createZigbeeNetwork(const ZigbeeAdapte
network->setSerialBaudrate(adapter.baudRate());
addNetwork(network);
qCDebug(dcZigbee()) << "Starting zigbee network" << network->networkUuid().toString();
qCDebug(dcZigbee()) << "Starting" << network;
network->startNetwork();
return ZigbeeErrorNoError;
@ -138,8 +138,8 @@ ZigbeeManager::ZigbeeError ZigbeeManager::removeZigbeeNetwork(const QUuid &netwo
return ZigbeeManager::ZigbeeErrorNetworkUuidNotFound;
}
qCDebug(dcZigbee()) << "Removing network" << networkUuid.toString();
ZigbeeNetwork *network = m_zigbeeNetworks.take(networkUuid);
qCDebug(dcZigbee()) << "Removing" << network;
// Note: destroy will remove all nodes from the network and wipe/delete the database
network->destroyNetwork();
emit zigbeeNetworkRemoved(network->networkUuid());
@ -154,26 +154,34 @@ ZigbeeManager::ZigbeeError ZigbeeManager::removeZigbeeNetwork(const QUuid &netwo
settings.endGroup();
settings.endGroup();
qCDebug(dcZigbee()) << "Network removed successfully" << networkUuid.toString();
qCDebug(dcZigbee()) << "Network removed successfully";
return ZigbeeManager::ZigbeeErrorNoError;
}
ZigbeeManager::ZigbeeError ZigbeeManager::setZigbeeNetworkPermitJoin(const QUuid &networkUuid, quint16 shortAddress, int duration)
ZigbeeManager::ZigbeeError ZigbeeManager::setZigbeeNetworkPermitJoin(const QUuid &networkUuid, quint16 shortAddress, uint duration)
{
if (!m_zigbeeNetworks.keys().contains(networkUuid)) {
qCWarning(dcZigbee()) << "Could not set permit join network" << networkUuid.toString() << "because there is no network with this uuid.";
return ZigbeeManager::ZigbeeErrorNetworkUuidNotFound;
}
if (duration > 255) {
qCWarning(dcZigbee()) << "The given duration for permit join is out of range. Only values between 0 and 255 are allowed.";
return ZigbeeManager::ZigbeeErrorDurationOutOfRange;
}
ZigbeeNetwork *network = m_zigbeeNetworks.value(networkUuid);
if (network->state() != ZigbeeNetwork::StateRunning) {
qCWarning(dcZigbee()) << "Could not set permit join network" << networkUuid.toString() << "because the network is not running.";
qCWarning(dcZigbee()) << "Could not set permit join in" << network << "because the network is not running.";
return ZigbeeManager::ZigbeeErrorNetworkOffline;
}
// TODO: set permit join
qCDebug(dcZigbee()) << "Set permit joining in network" << network << "to" << duration << "seconds" << ZigbeeUtils::convertUint16ToHexString(shortAddress);
network->setPermitJoining(duration, shortAddress);
// Notify all clients about the new configuration
emit zigbeeNetworkChanged(network);
qCDebug(dcZigbee()) << "Set permit join for network" << networkUuid.toString() << ZigbeeUtils::convertUint16ToHexString(shortAddress) << "to" << duration << "[s] successfully.";
return ZigbeeManager::ZigbeeErrorNoError;
}
@ -185,6 +193,7 @@ ZigbeeManager::ZigbeeError ZigbeeManager::factoryResetNetwork(const QUuid &netwo
}
ZigbeeNetwork *network = m_zigbeeNetworks.value(networkUuid);
qCDebug(dcZigbee()) << "Start factory resetting" << network;
network->factoryResetNetwork();
return ZigbeeManager::ZigbeeErrorNoError;
}
@ -221,8 +230,8 @@ void ZigbeeManager::saveNetwork(ZigbeeNetwork *network)
void ZigbeeManager::loadZigbeeNetworks()
{
NymeaSettings settings(NymeaSettings::SettingsRoleZigbee);
qCDebug(dcZigbee()) << "Loading zigbee networks from" << settings.fileName();
settings.beginGroup("ZigbeeNetworks");
foreach (const QString networkUuidGroupString, settings.childGroups()) {
settings.beginGroup(networkUuidGroupString);
@ -260,6 +269,7 @@ void ZigbeeManager::loadZigbeeNetworks()
if (m_zigbeeNetworks.isEmpty()) {
qCDebug(dcZigbee()) << "There are no zigbee networks configured yet.";
return;
}
// Start all loaded networks
@ -294,55 +304,55 @@ void ZigbeeManager::addNetwork(ZigbeeNetwork *network)
});
connect(network, &ZigbeeNetwork::errorOccured, this, [network](ZigbeeNetwork::Error error){
qCWarning(dcZigbee()) << "Network error occured for network" << network->networkUuid().toString() << error;
qCWarning(dcZigbee()) << "Network error occured for" << network << error;
// TODO: handle error
});
connect(network, &ZigbeeNetwork::panIdChanged, this, [this, network](quint16 panId){
qCDebug(dcZigbee()) << "Network PAN ID changed" << network->networkUuid().toString() << panId;
qCDebug(dcZigbee()) << "Network PAN ID changed for" << network << panId;
saveNetwork(network);
emit zigbeeNetworkChanged(network);
});
connect(network, &ZigbeeNetwork::channelChanged, this, [this, network](quint8 channel){
qCDebug(dcZigbee()) << "Network channel changed" << network->networkUuid().toString() << channel;
qCDebug(dcZigbee()) << "Network channel changed for" << network << channel;
saveNetwork(network);
emit zigbeeNetworkChanged(network);
});
connect(network, &ZigbeeNetwork::macAddressChanged, this, [this, network](const ZigbeeAddress &macAddress){
qCDebug(dcZigbee()) << "Network MAC address changed" << network->networkUuid().toString() << macAddress.toString();
qCDebug(dcZigbee()) << "Network MAC address changed for" << network << macAddress.toString();
saveNetwork(network);
emit zigbeeNetworkChanged(network);
});
connect(network, &ZigbeeNetwork::securityConfigurationChanged, this, [this, network](const ZigbeeSecurityConfiguration &securityConfiguration){
qCDebug(dcZigbee()) << "Network security configuration changed" << network->networkUuid().toString() << securityConfiguration.networkKey().toString();
qCDebug(dcZigbee()) << "Network security configuration changed for" << network << securityConfiguration.networkKey().toString() << securityConfiguration.globalTrustCenterLinkKey().toString();
saveNetwork(network);
});
connect(network, &ZigbeeNetwork::channelMaskChanged, this, [this, network](const ZigbeeChannelMask &channelMask){
qCDebug(dcZigbee()) << "Network channel mask changed" << network->networkUuid().toString() << channelMask;
qCDebug(dcZigbee()) << "Network channel mask changed for" << network << channelMask;
saveNetwork(network);
emit zigbeeNetworkChanged(network);
});
connect(network, &ZigbeeNetwork::permitJoiningChanged, this, [this, network](bool permitJoiningChanged){
qCDebug(dcZigbee()) << "Network permit joining changed" << network->networkUuid().toString() << permitJoiningChanged;
connect(network, &ZigbeeNetwork::permitJoiningEnabledChanged, this, [this, network](bool permitJoiningEnabled){
qCDebug(dcZigbee()) << "Network permit joining changed" << network->networkUuid().toString() << permitJoiningEnabled;
emit zigbeeNetworkChanged(network);
});
connect(network, &ZigbeeNetwork::nodeAdded, this, [network](ZigbeeNode *node){
qCDebug(dcZigbee()) << "Network node added to network" << network->networkUuid().toString() << node;
qCDebug(dcZigbee()) << "Node added to" << network << node;
});
connect(network, &ZigbeeNetwork::nodeRemoved, this, [network](ZigbeeNode *node){
qCDebug(dcZigbee()) << "Network node removed from network" << network->networkUuid().toString() << node;
qCDebug(dcZigbee()) << "Node removed from" << network->networkUuid().toString() << node;
});
connect(network, &ZigbeeNetwork::firmwareVersionChanged, this, [this, network](const QString &firmwareVersion){
qCDebug(dcZigbee()) << "Network adapter firmware version changed" << network->networkUuid().toString() << firmwareVersion;
qCDebug(dcZigbee()) << "Network adapter firmware version changed for" << network << firmwareVersion;
emit zigbeeNetworkChanged(network);
});

3
libnymea-core/zigbee/zigbeemanager.h
View File

@ -58,6 +58,7 @@ public:
ZigbeeErrorAdapterNotAvailable,
ZigbeeErrorAdapterAlreadyInUse,
ZigbeeErrorNetworkUuidNotFound,
ZigbeeErrorDurationOutOfRange,
ZigbeeErrorNetworkOffline
};
Q_ENUM(ZigbeeError)
@ -72,7 +73,7 @@ public:
ZigbeeError createZigbeeNetwork(const ZigbeeAdapter &adapter, const ZigbeeChannelMask channelMask = ZigbeeChannelMask(ZigbeeChannelMask::ChannelConfigurationAllChannels));
ZigbeeError removeZigbeeNetwork(const QUuid &networkUuid);
ZigbeeError setZigbeeNetworkPermitJoin(const QUuid &networkUuid, quint16 shortAddress = Zigbee::BroadcastAddressAllRouters, int duration = 120);
ZigbeeError setZigbeeNetworkPermitJoin(const QUuid &networkUuid, quint16 shortAddress = Zigbee::BroadcastAddressAllRouters, uint duration = 120);
ZigbeeError factoryResetNetwork(const QUuid &networkUuid);
private: