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

SunSpec: Fix autoremove devices if the model does not exist any more

master
Simon Stürz 2023-05-30 15:12:33 +02:00
parent 67bc283084
commit 0bdfeb81dc
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sunspec/integrationpluginsunspec.cpp
View File

@ -626,12 +626,16 @@ void IntegrationPluginSunSpec::processDiscoveryResult(Thing *thing, SunSpecConne
// - Some SunSpec device seem to communicate different model id depending on the startup phase // - Some SunSpec device seem to communicate different model id depending on the startup phase
// i.e. they communicate a SinglePhase Meter on register x, few mnutes later it is a 3 phase meter on x // i.e. they communicate a SinglePhase Meter on register x, few mnutes later it is a 3 phase meter on x
// This code should handle such weird setups... // This code should handle such weird setups...
if (connection->models().isEmpty())
return;
foreach (Thing *child, myThings().filterByParentId(thing->id())) { foreach (Thing *child, myThings().filterByParentId(thing->id())) {
if (!m_modelIdParamTypeIds.contains(child->thingClassId()) || connection->models().isEmpty()) if (!m_modelIdParamTypeIds.contains(child->thingClassId()) || !m_modbusAddressParamTypeIds.contains(child->thingClassId()))
continue; continue;
uint childModelId = child->paramValue(m_modelIdParamTypeIds.value(thing->thingClassId())).toUInt(); uint childModelId = child->paramValue(m_modelIdParamTypeIds.value(child->thingClassId())).toUInt();
uint childModbusAddress = child->paramValue(m_modbusAddressParamTypeIds.value(thing->thingClassId())).toUInt(); uint childModbusAddress = child->paramValue(m_modbusAddressParamTypeIds.value(child->thingClassId())).toUInt();
bool modelFoundForChild = false; bool modelFoundForChild = false;
foreach (SunSpecModel *model, connection->models()) { foreach (SunSpecModel *model, connection->models()) {