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 #85: Improve Deconz backend version number representation

build-noble
jenkins 2023-11-23 09:52:06 +01:00
parent 66e42cf1d0 34ade62e4e
commit e61b5c3668
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -496,20 +496,39 @@ 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();
} else { } else {
qCDebug(dcZigbeeNetwork()) << "Version request finished successfully" << ZigbeeUtils::convertByteArrayToHexString(reply->responseData());
// Note: version is an uint32 value, little endian, but we can read the individual bytes in reversed order // Note: version is an uint32 value, little endian, but we can read the individual bytes in reversed order
qCDebug(dcZigbeeNetwork()) << "Version request finished successfully" << ZigbeeUtils::convertByteArrayToHexString(reply->responseData());
quint8 majorVersion = static_cast<quint8>(reply->responseData().at(3)); quint8 majorVersion = static_cast<quint8>(reply->responseData().at(3));
quint8 minorVersion = static_cast<quint8>(reply->responseData().at(2)); quint8 minorVersion = static_cast<quint8>(reply->responseData().at(2));
Deconz::Platform platform = static_cast<Deconz::Platform>(reply->responseData().at(1)); Deconz::Platform platform = static_cast<Deconz::Platform>(reply->responseData().at(1));
m_firmwareVersion = QString("%1.%2").arg(majorVersion).arg(minorVersion); quint8 patchVersion = static_cast<quint8>(reply->responseData().at(0));
qCDebug(dcZigbeeNetwork()) << "Firmware version" << firmwareVersion << platform; QString platformString;
switch (platform) {
case Deconz::PlatformConbeeRaspbee:
platformString = "RaspBee";
break;
case Deconz::PlatformConbeeII:
platformString = "ConBee II";
break;
default:
platformString = "N/A";
}
QString versionString = QString("0x%1%2%3%4").arg(majorVersion, 2, 16, QChar('0'))
.arg(minorVersion, 2, 16, QChar('0'))
.arg(platform, 2, 16, QChar('0'))
.arg(patchVersion, 2, 16, QChar('0'));
m_firmwareVersion = QString("%1.%2 - %3 (%4)").arg(majorVersion).arg(minorVersion).arg(platformString).arg(QString(versionString));
qCDebug(dcZigbeeNetwork()) << "Firmware version" << firmwareVersion << platform << versionString;
} }
if (!m_firmwareVersion.isEmpty()) { if (!m_firmwareVersion.isEmpty()) {
m_controller->setFirmwareVersion(QString("%1 - %2").arg(m_firmwareVersion).arg(m_protocolVersion)); m_controller->setFirmwareVersion(m_firmwareVersion);
} else { } else {
m_controller->setFirmwareVersion(m_protocolVersion); m_controller->setFirmwareVersion("N/A");
} }
qCDebug(dcZigbeeNetwork()) << "Reading current network state"; qCDebug(dcZigbeeNetwork()) << "Reading current network state";