From 16d4bfa0e01641c3fe82bcb419190f7b230f472d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Fri, 18 Dec 2020 15:35:32 +0100 Subject: [PATCH] Add serialnumber member to network class and extend deconz backend rectry range --- .../backends/deconz/zigbeenetworkdeconz.cpp | 6 +++--- libnymea-zigbee/zigbeenetwork.cpp | 10 ++++++++++ libnymea-zigbee/zigbeenetwork.h | 4 ++++ libnymea-zigbee/zigbeeuartadapter.cpp | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/libnymea-zigbee/backends/deconz/zigbeenetworkdeconz.cpp b/libnymea-zigbee/backends/deconz/zigbeenetworkdeconz.cpp index 1c75d36..d3d67b1 100644 --- a/libnymea-zigbee/backends/deconz/zigbeenetworkdeconz.cpp +++ b/libnymea-zigbee/backends/deconz/zigbeenetworkdeconz.cpp @@ -406,11 +406,11 @@ void ZigbeeNetworkDeconz::runNetworkInitProcess() if (reply->statusCode() != Deconz::StatusCodeSuccess) { qCWarning(dcZigbeeController()) << "Request" << reply->command() << "finished with error" << reply->statusCode(); m_initRetry++; - if (m_initRetry < 3) { - qCDebug(dcZigbeeNetwork()) << "Retry to initialize network" << m_initRetry << "/ 3"; + if (m_initRetry < 10) { + qCDebug(dcZigbeeNetwork()) << "Retry to initialize network" << m_initRetry << "/ 10"; runNetworkInitProcess(); } else { - qCWarning(dcZigbeeNetwork()) << "Failed to read firmware version after 3 attempts. Giving up"; + qCWarning(dcZigbeeNetwork()) << "Failed to read firmware version after 10 attempts. Giving up"; m_controller->disable(); } return; diff --git a/libnymea-zigbee/zigbeenetwork.cpp b/libnymea-zigbee/zigbeenetwork.cpp index 5d7e3ba..d5a0c47 100644 --- a/libnymea-zigbee/zigbeenetwork.cpp +++ b/libnymea-zigbee/zigbeenetwork.cpp @@ -129,6 +129,16 @@ void ZigbeeNetwork::setSerialBaudrate(qint32 baudrate) emit serialBaudrateChanged(m_serialBaudrate); } +QString ZigbeeNetwork::serialNumber() const +{ + return m_serialNumber; +} + +void ZigbeeNetwork::setSerialNumber(const QString &serialNumber) +{ + m_serialNumber = serialNumber; +} + ZigbeeAddress ZigbeeNetwork::macAddress() const { return m_macAddress; diff --git a/libnymea-zigbee/zigbeenetwork.h b/libnymea-zigbee/zigbeenetwork.h index 8f6d3e7..e63e026 100644 --- a/libnymea-zigbee/zigbeenetwork.h +++ b/libnymea-zigbee/zigbeenetwork.h @@ -84,6 +84,9 @@ public: qint32 serialBaudrate() const; void setSerialBaudrate(qint32 baudrate); + QString serialNumber() const; + void setSerialNumber(const QString &serialNumber); + ZigbeeAddress macAddress() const; void setMacAddress(const ZigbeeAddress &zigbeeAddress); @@ -135,6 +138,7 @@ private: // Serial port configuration QString m_serialPortName = "/dev/ttyUSB0"; + QString m_serialNumber; qint32 m_serialBaudrate = 115200; ZigbeeAddress m_macAddress; diff --git a/libnymea-zigbee/zigbeeuartadapter.cpp b/libnymea-zigbee/zigbeeuartadapter.cpp index b8e6295..5d26f50 100644 --- a/libnymea-zigbee/zigbeeuartadapter.cpp +++ b/libnymea-zigbee/zigbeeuartadapter.cpp @@ -110,7 +110,7 @@ QDebug operator<<(QDebug debug, const ZigbeeUartAdapter &adapter) debug.nospace() << ", " << adapter.serialNumber(); } if (adapter.hardwareRecognized()) { - debug.nospace() << "Suggested backend: " << adapter.zigbeeBackend(); + debug.nospace() << ", Suggested backend: " << adapter.zigbeeBackend(); debug.nospace() << ", " << adapter.baudRate(); }