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

Rename backend type enum

pull/11/head
Simon Stürz 2020-10-28 11:42:33 +01:00
parent 6ffd8a61db
commit f883e24f51
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libnymea-zigbee/zigbee.h
View File

@ -40,11 +40,11 @@ class Zigbee
Q_GADGET
public:
enum BackendType {
BackendTypeDeconz,
BackendTypeNxp
enum ZigbeeBackendType {
ZigbeeBackendTypeDeconz,
ZigbeeBackendTypeNxp
};
Q_ENUM(BackendType)
Q_ENUM(ZigbeeBackendType)
enum ZigbeeProfile {
ZigbeeProfileDevice = 0x0000,

10
libnymea-zigbee/zigbeeadapter.cpp
View File

@ -72,14 +72,14 @@ void ZigbeeAdapter::setBackendSuggestionAvailable(bool backendSuggestionAvailabl
m_backendSuggestionAvailable = backendSuggestionAvailable;
}
Zigbee::BackendType ZigbeeAdapter::suggestedBackendType() const
Zigbee::ZigbeeBackendType ZigbeeAdapter::suggestedZigbeeBackendType() const
{
return m_suggestedBackendType;
return m_suggestedZigbeeBackendType;
}
void ZigbeeAdapter::setSuggestedBackendType(Zigbee::BackendType backendType)
void ZigbeeAdapter::setSuggestedZigbeeBackendType(Zigbee::ZigbeeBackendType backendType)
{
m_suggestedBackendType = backendType;
m_suggestedZigbeeBackendType = backendType;
}
qint32 ZigbeeAdapter::suggestedBaudRate() const
@ -97,7 +97,7 @@ QDebug operator<<(QDebug debug, const ZigbeeAdapter &adapter)
debug.nospace() << "ZigbeeAdapter(" << adapter.name() << " - " << adapter.description();
debug.nospace() << ", " << adapter.systemLocation();
if (adapter.backendSuggestionAvailable()) {
debug.nospace() << "Suggested backend: " << adapter.suggestedBackendType();
debug.nospace() << "Suggested backend: " << adapter.suggestedZigbeeBackendType();
debug.nospace() << ", " << adapter.suggestedBaudRate();
}

6
libnymea-zigbee/zigbeeadapter.h
View File

@ -55,8 +55,8 @@ public:
bool backendSuggestionAvailable() const;
void setBackendSuggestionAvailable(bool backendSuggestionAvailable);
Zigbee::BackendType suggestedBackendType() const;
void setSuggestedBackendType(Zigbee::BackendType backendType);
Zigbee::ZigbeeBackendType suggestedZigbeeBackendType() const;
void setSuggestedZigbeeBackendType(Zigbee::ZigbeeBackendType backendType);
qint32 suggestedBaudRate() const;
void setSuggestedBaudRate(qint32 baudRate);
@ -67,7 +67,7 @@ private:
QString m_systemLocation;
bool m_backendSuggestionAvailable = false;
Zigbee::BackendType m_suggestedBackendType = Zigbee::BackendTypeDeconz;
Zigbee::ZigbeeBackendType m_suggestedZigbeeBackendType = Zigbee::ZigbeeBackendTypeDeconz;
qint32 m_suggestedBaudRate = 38400;
};

12
libnymea-zigbee/zigbeenetworkmanager.cpp
View File

@ -71,11 +71,11 @@ QList<ZigbeeAdapter> ZigbeeNetworkManager::availableAdapters()
// Check if we recognize this adapter from USB information
if (serialPortInfo.manufacturer().toLower().contains("dresden elektronik")) {
adapter.setBackendSuggestionAvailable(true);
adapter.setSuggestedBackendType(Zigbee::BackendTypeDeconz);
adapter.setSuggestedZigbeeBackendType(Zigbee::ZigbeeBackendTypeDeconz);
adapter.setSuggestedBaudRate(38400);
} else if (serialPortInfo.manufacturer().toLower().contains("nxp")) {
adapter.setBackendSuggestionAvailable(true);
adapter.setSuggestedBackendType(Zigbee::BackendTypeNxp);
adapter.setSuggestedZigbeeBackendType(Zigbee::ZigbeeBackendTypeNxp);
adapter.setSuggestedBaudRate(115200);
}
@ -85,20 +85,20 @@ QList<ZigbeeAdapter> ZigbeeNetworkManager::availableAdapters()
return adapters;
}
QStringList ZigbeeNetworkManager::availableBackendTypes()
QStringList ZigbeeNetworkManager::availableZigbeeBackendTypes()
{
return {"deCONZ", "NXP"};
}
ZigbeeNetwork *ZigbeeNetworkManager::createZigbeeNetwork(Zigbee::BackendType backend, QObject *parent)
ZigbeeNetwork *ZigbeeNetworkManager::createZigbeeNetwork(Zigbee::ZigbeeBackendType backend, QObject *parent)
{
// Note: required for generating random PAN ID
srand(static_cast<uint>(QDateTime::currentMSecsSinceEpoch() / 1000));
switch (backend) {
case Zigbee::BackendTypeNxp:
case Zigbee::ZigbeeBackendTypeNxp:
return qobject_cast<ZigbeeNetwork *>(new ZigbeeNetworkNxp(parent));
case Zigbee::BackendTypeDeconz:
case Zigbee::ZigbeeBackendTypeDeconz:
return qobject_cast<ZigbeeNetwork *>(new ZigbeeNetworkDeconz(parent));
}

4
libnymea-zigbee/zigbeenetworkmanager.h
View File

@ -38,8 +38,8 @@ class ZigbeeNetworkManager
Q_GADGET
public:
static QList<ZigbeeAdapter> availableAdapters();
static QStringList availableBackendTypes();
static ZigbeeNetwork *createZigbeeNetwork(Zigbee::BackendType backend, QObject *parent = nullptr);
static QStringList availableZigbeeBackendTypes();
static ZigbeeNetwork *createZigbeeNetwork(Zigbee::ZigbeeBackendType backend, QObject *parent = nullptr);
};
Q_DECLARE_METATYPE(ZigbeeNetworkManager)