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

Rename Backend type and define ZigbeeNetworkState within the manager

Browse Source
This commit is contained in:
Simon Stürz 2020-10-28 11:42:06 +01:00
parent afc97fd244
commit 4a520d8ba1
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnymea-core/jsonrpc/jsonrpcserverimplementation.cpp
View File

@ -73,6 +73,7 @@
#include "tagshandler.h" #include "tagshandler.h"
#include "systemhandler.h" #include "systemhandler.h"
#include "usershandler.h" #include "usershandler.h"
#include "zigbeehandler.h"
#include <QJsonDocument> #include <QJsonDocument>
#include <QStringList> #include <QStringList>
@ -595,6 +596,7 @@ void JsonRPCServerImplementation::setup()
registerHandler(new TagsHandler(this)); registerHandler(new TagsHandler(this));
registerHandler(new SystemHandler(NymeaCore::instance()->platform(), this)); registerHandler(new SystemHandler(NymeaCore::instance()->platform(), this));
registerHandler(new UsersHandler(NymeaCore::instance()->userManager(), this)); registerHandler(new UsersHandler(NymeaCore::instance()->userManager(), this));
registerHandler(new ZigbeeHandler(NymeaCore::instance()->zigbeeManager(), this));
connect(NymeaCore::instance()->cloudManager(), &CloudManager::pairingReply, this, &JsonRPCServerImplementation::pairingFinished); connect(NymeaCore::instance()->cloudManager(), &CloudManager::pairingReply, this, &JsonRPCServerImplementation::pairingFinished);
connect(NymeaCore::instance()->cloudManager(), &CloudManager::connectionStateChanged, this, &JsonRPCServerImplementation::onCloudConnectionStateChanged); connect(NymeaCore::instance()->cloudManager(), &CloudManager::connectionStateChanged, this, &JsonRPCServerImplementation::onCloudConnectionStateChanged);

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

@ -37,11 +37,8 @@ ZigbeeHandler::ZigbeeHandler(ZigbeeManager *zigbeeManager, QObject *parent) :
JsonHandler(parent), JsonHandler(parent),
m_zigbeeManager(zigbeeManager) m_zigbeeManager(zigbeeManager)
{ {
registerEnum<ZigbeeNetwork::State>(); registerEnum<ZigbeeManager::ZigbeeNetworkState>();
registerEnum<Zigbee::BackendType>(); registerEnum<Zigbee::ZigbeeBackendType>();
// registerObject<ZigbeeSerialPort>();
// registerObject<ZigbeeSerialPort, ZigbeeSerialPortList>();
QVariantMap params, returns; QVariantMap params, returns;
QString description; QString description;
@ -60,13 +57,13 @@ ZigbeeHandler::ZigbeeHandler(ZigbeeManager *zigbeeManager, QObject *parent) :
returns.insert("configured", enumValueName(Bool)); returns.insert("configured", enumValueName(Bool));
returns.insert("serialPort", enumValueName(String)); returns.insert("serialPort", enumValueName(String));
returns.insert("baudRate", enumValueName(Uint)); returns.insert("baudRate", enumValueName(Uint));
returns.insert("backend", enumRef<Zigbee::BackendType>()); returns.insert("backend", enumRef<Zigbee::ZigbeeBackendType>());
returns.insert("firmwareVersion", enumValueName(String)); returns.insert("firmwareVersion", enumValueName(String));
returns.insert("networkIeeeeAddress", enumValueName(String)); returns.insert("networkIeeeeAddress", enumValueName(String));
returns.insert("networkPanId", enumValueName(Uint)); returns.insert("networkPanId", enumValueName(Uint));
returns.insert("channel", enumValueName(Uint)); returns.insert("channel", enumValueName(Uint));
returns.insert("permitJoin", enumValueName(Bool)); returns.insert("permitJoin", enumValueName(Bool));
returns.insert("networkState", enumRef<ZigbeeNetwork::State>()); returns.insert("networkState", enumRef<ZigbeeManager::ZigbeeNetworkState>());
registerMethod("GetNetworkStatus", description, params, returns); registerMethod("GetNetworkStatus", description, params, returns);
// GetUartInterfaces // GetUartInterfaces

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

@ -59,7 +59,7 @@ ZigbeeNetwork *ZigbeeManager::zigbeeNetwork() const
return m_zigbeeNetwork; return m_zigbeeNetwork;
} }
void ZigbeeManager::createZigbeeNetwork(const QString &serialPort, qint32 baudrate, Zigbee::BackendType backend) void ZigbeeManager::createZigbeeNetwork(const QString &serialPort, qint32 baudrate, Zigbee::ZigbeeBackendType backend)
{ {
if (m_zigbeeNetwork) { if (m_zigbeeNetwork) {
delete m_zigbeeNetwork; delete m_zigbeeNetwork;

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

@ -41,6 +41,14 @@ class ZigbeeManager : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
enum ZigbeeNetworkState {
ZigbeeNetworkStateOffline,
ZigbeeNetworkStateUpdating,
ZigbeeNetworkStateOnline,
ZigbeeNetworkStateError
};
Q_ENUM(ZigbeeNetworkState)
explicit ZigbeeManager(QObject *parent = nullptr); explicit ZigbeeManager(QObject *parent = nullptr);
bool available() const; bool available() const;
@ -48,7 +56,7 @@ public:
ZigbeeNetwork *zigbeeNetwork() const; ZigbeeNetwork *zigbeeNetwork() const;
void createZigbeeNetwork(const QString &serialPort, qint32 baudrate, Zigbee::BackendType backend); void createZigbeeNetwork(const QString &serialPort, qint32 baudrate, Zigbee::ZigbeeBackendType backend);
private: private:
ZigbeeNetwork *m_zigbeeNetwork = nullptr; ZigbeeNetwork *m_zigbeeNetwork = nullptr;