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

Add serialnumber member to network class and extend deconz backend rectry range

Browse Source
This commit is contained in:
Simon Stürz 2020-12-18 15:35:32 +01:00
parent 3ba1c9b958
commit 16d4bfa0e0
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libnymea-zigbee/backends/deconz/zigbeenetworkdeconz.cpp
View File

@ -406,11 +406,11 @@ void ZigbeeNetworkDeconz::runNetworkInitProcess()
if (reply->statusCode() != Deconz::StatusCodeSuccess) { if (reply->statusCode() != Deconz::StatusCodeSuccess) {
qCWarning(dcZigbeeController()) << "Request" << reply->command() << "finished with error" << reply->statusCode(); qCWarning(dcZigbeeController()) << "Request" << reply->command() << "finished with error" << reply->statusCode();
m_initRetry++; m_initRetry++;
if (m_initRetry < 3) { if (m_initRetry < 10) {
qCDebug(dcZigbeeNetwork()) << "Retry to initialize network" << m_initRetry << "/ 3"; qCDebug(dcZigbeeNetwork()) << "Retry to initialize network" << m_initRetry << "/ 10";
runNetworkInitProcess(); runNetworkInitProcess();
} else { } 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(); m_controller->disable();
} }
return; return;

10
libnymea-zigbee/zigbeenetwork.cpp
View File

@ -129,6 +129,16 @@ void ZigbeeNetwork::setSerialBaudrate(qint32 baudrate)
emit serialBaudrateChanged(m_serialBaudrate); emit serialBaudrateChanged(m_serialBaudrate);
} }
QString ZigbeeNetwork::serialNumber() const
{
return m_serialNumber;
}
void ZigbeeNetwork::setSerialNumber(const QString &serialNumber)
{
m_serialNumber = serialNumber;
}
ZigbeeAddress ZigbeeNetwork::macAddress() const ZigbeeAddress ZigbeeNetwork::macAddress() const
{ {
return m_macAddress; return m_macAddress;

4
libnymea-zigbee/zigbeenetwork.h
View File

@ -84,6 +84,9 @@ public:
qint32 serialBaudrate() const; qint32 serialBaudrate() const;
void setSerialBaudrate(qint32 baudrate); void setSerialBaudrate(qint32 baudrate);
QString serialNumber() const;
void setSerialNumber(const QString &serialNumber);
ZigbeeAddress macAddress() const; ZigbeeAddress macAddress() const;
void setMacAddress(const ZigbeeAddress &zigbeeAddress); void setMacAddress(const ZigbeeAddress &zigbeeAddress);
@ -135,6 +138,7 @@ private:
// Serial port configuration // Serial port configuration
QString m_serialPortName = "/dev/ttyUSB0"; QString m_serialPortName = "/dev/ttyUSB0";
QString m_serialNumber;
qint32 m_serialBaudrate = 115200; qint32 m_serialBaudrate = 115200;
ZigbeeAddress m_macAddress; ZigbeeAddress m_macAddress;

2
libnymea-zigbee/zigbeeuartadapter.cpp
View File

@ -110,7 +110,7 @@ QDebug operator<<(QDebug debug, const ZigbeeUartAdapter &adapter)
debug.nospace() << ", " << adapter.serialNumber(); debug.nospace() << ", " << adapter.serialNumber();
} }
if (adapter.hardwareRecognized()) { if (adapter.hardwareRecognized()) {
debug.nospace() << "Suggested backend: " << adapter.zigbeeBackend(); debug.nospace() << ", Suggested backend: " << adapter.zigbeeBackend();
debug.nospace() << ", " << adapter.baudRate(); debug.nospace() << ", " << adapter.baudRate();
} }