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

Move zigbeemanager include into the cpp

Browse Source
This commit is contained in:
Simon Stürz 2020-11-16 14:50:16 +01:00
parent 3ae8baaa40
commit 255a6dc090
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnymea-core/nymeacore.cpp
View File

@ -51,6 +51,8 @@
#include "cloud/cloudnotifications.h" #include "cloud/cloudnotifications.h"
#include "cloud/cloudtransport.h" #include "cloud/cloudtransport.h"
#include "zigbee/zigbeemanager.h"
#include <networkmanager.h> #include <networkmanager.h>
#include <QDir> #include <QDir>

2
libnymea-core/nymeacore.h
View File

@ -46,8 +46,6 @@
#include "time/timemanager.h" #include "time/timemanager.h"
#include "hardwaremanagerimplementation.h" #include "hardwaremanagerimplementation.h"
#include "zigbee/zigbeemanager.h"
#include "debugserverhandler.h" #include "debugserverhandler.h"
#include <QObject> #include <QObject>

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

@ -400,8 +400,8 @@ void ZigbeeManager::addNetwork(ZigbeeNetwork *network)
} }
ZigbeeNodeInitializer *nodeInitializer = m_zigbeeNodeInitializers.value(network->networkUuid()); // ZigbeeNodeInitializer *nodeInitializer = m_zigbeeNodeInitializers.value(network->networkUuid());
nodeInitializer->initializeNode(node); // nodeInitializer->initializeNode(node);
//TODO: emit node added once initialized so the plugins can use it //TODO: emit node added once initialized so the plugins can use it
emit nodeAdded(network->networkUuid(), node); emit nodeAdded(network->networkUuid(), node);

5
libnymea-core/zigbee/zigbeenodeinitializer.cpp
View File

@ -119,11 +119,12 @@ void ZigbeeNodeInitializer::initializeNode(ZigbeeNode *node)
connect(zdoReply, &ZigbeeDeviceObjectReply::finished, this, [this, node, zdoReply](){ connect(zdoReply, &ZigbeeDeviceObjectReply::finished, this, [this, node, zdoReply](){
if (zdoReply->error() != ZigbeeDeviceObjectReply::ErrorNoError) { if (zdoReply->error() != ZigbeeDeviceObjectReply::ErrorNoError) {
qCWarning(dcZigbee()) << "Failed to bind Level cluster attributes" << zdoReply->error(); qCWarning(dcZigbee()) << "Failed to bind Level cluster attributes" << zdoReply->error();
emit nodeInitialized(node); //emit nodeInitialized(node);
return; return;
} }
emit nodeInitialized(node);
}); });
} }
} }
//emit nodeInitialized(node);
} }