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

Amperfied: Verify version number durin discovery

pull/148/head
Michael Zanetti 2023-08-14 15:44:21 +02:00
parent ac47803265
commit 8f2aa88000
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
amperfied/connecthomediscovery.cpp
View File

@ -85,6 +85,13 @@ void ConnectHomeDiscovery::checkNetworkDevice(const NetworkDeviceInfo &networkDe
cleanupConnection(connection); cleanupConnection(connection);
return; return;
} }
if (connection->version() < 0x100 || connection->version() > 0x2ff) {
qCInfo(dcAmperfied()) << "Skipping invalid/unsupported AMPERFIED version" << connection->version();
cleanupConnection(connection);
return;
}
Result result; Result result;
result.firmwareVersion = connection->version(); result.firmwareVersion = connection->version();
result.networkDeviceInfo = networkDeviceInfo; result.networkDeviceInfo = networkDeviceInfo;

2
amperfied/integrationpluginamperfied.cpp
View File

@ -44,8 +44,6 @@ IntegrationPluginAmperfied::IntegrationPluginAmperfied()
void IntegrationPluginAmperfied::discoverThings(ThingDiscoveryInfo *info) void IntegrationPluginAmperfied::discoverThings(ThingDiscoveryInfo *info)
{ {
hardwareManager()->modbusRtuResource();
if (info->thingClassId() == energyControlThingClassId) { if (info->thingClassId() == energyControlThingClassId) {
EnergyControlDiscovery *discovery = new EnergyControlDiscovery(hardwareManager()->modbusRtuResource(), info); EnergyControlDiscovery *discovery = new EnergyControlDiscovery(hardwareManager()->modbusRtuResource(), info);