diff --git a/libnymea-zigbee/zigbee.h b/libnymea-zigbee/zigbee.h index ea03016..1d9c66e 100644 --- a/libnymea-zigbee/zigbee.h +++ b/libnymea-zigbee/zigbee.h @@ -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, diff --git a/libnymea-zigbee/zigbeeadapter.cpp b/libnymea-zigbee/zigbeeadapter.cpp index 1cee3c5..f4b285b 100644 --- a/libnymea-zigbee/zigbeeadapter.cpp +++ b/libnymea-zigbee/zigbeeadapter.cpp @@ -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(); } diff --git a/libnymea-zigbee/zigbeeadapter.h b/libnymea-zigbee/zigbeeadapter.h index 5cf5881..974cae0 100644 --- a/libnymea-zigbee/zigbeeadapter.h +++ b/libnymea-zigbee/zigbeeadapter.h @@ -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; }; diff --git a/libnymea-zigbee/zigbeenetworkmanager.cpp b/libnymea-zigbee/zigbeenetworkmanager.cpp index 1ab2a36..d6e4adf 100644 --- a/libnymea-zigbee/zigbeenetworkmanager.cpp +++ b/libnymea-zigbee/zigbeenetworkmanager.cpp @@ -71,11 +71,11 @@ QList 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 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(QDateTime::currentMSecsSinceEpoch() / 1000)); switch (backend) { - case Zigbee::BackendTypeNxp: + case Zigbee::ZigbeeBackendTypeNxp: return qobject_cast(new ZigbeeNetworkNxp(parent)); - case Zigbee::BackendTypeDeconz: + case Zigbee::ZigbeeBackendTypeDeconz: return qobject_cast(new ZigbeeNetworkDeconz(parent)); } diff --git a/libnymea-zigbee/zigbeenetworkmanager.h b/libnymea-zigbee/zigbeenetworkmanager.h index ebc003a..c62e80a 100644 --- a/libnymea-zigbee/zigbeenetworkmanager.h +++ b/libnymea-zigbee/zigbeenetworkmanager.h @@ -38,8 +38,8 @@ class ZigbeeNetworkManager Q_GADGET public: static QList 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)