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

Merge PR #36: deConz: Remove unused/redundant firmware version string members

pull/45/head
Jenkins nymea 2022-03-10 12:33:42 +01:00
parent edfe29775a 45eb4de576
commit 5ccf077941
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,12 +56,6 @@ DeconzNetworkConfiguration ZigbeeBridgeControllerDeconz::networkConfiguration()
return m_networkConfiguration;
}
void ZigbeeBridgeControllerDeconz::setFirmwareVersionString(const QString &firmwareVersion)
{
m_firmwareVersion = firmwareVersion;
emit firmwareVersionChanged(m_firmwareVersion);
}
Deconz::NetworkState ZigbeeBridgeControllerDeconz::networkState() const
{
return m_networkState;

1
libnymea-zigbee/backends/deconz/zigbeebridgecontrollerdeconz.h
View File

@ -83,7 +83,6 @@ public:
~ZigbeeBridgeControllerDeconz() override;
DeconzNetworkConfiguration networkConfiguration() const;
void setFirmwareVersionString(const QString &firmwareVersion);
Deconz::NetworkState networkState() const;
void rebootController();

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

@ -491,9 +491,9 @@ void ZigbeeNetworkDeconz::runNetworkInitProcess()
}
if (!m_firmwareVersion.isEmpty()) {
m_controller->setFirmwareVersionString(QString("%1 - %2").arg(m_firmwareVersion).arg(m_protocolVersion));
m_controller->setFirmwareVersion(QString("%1 - %2").arg(m_firmwareVersion).arg(m_protocolVersion));
} else {
m_controller->setFirmwareVersionString(m_protocolVersion);
m_controller->setFirmwareVersion(m_protocolVersion);
}
qCDebug(dcZigbeeNetwork()) << "Reading current network state";