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

fixed thing setup

master
Boernsman 2021-04-21 20:30:37 +02:00 committed by Michael Zanetti
parent 7dded817c9
commit 799a831081
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
energymeters/integrationpluginenergymeters.cpp
View File

@ -71,8 +71,8 @@ IntegrationPluginEnergyMeters::IntegrationPluginEnergyMeters()
m_registerMaps.insert(pro380ThingClassId, pro380RegisterMap);
m_registerMaps.insert(sdm630ThingClassId, sdm630RegisterMap);
// Modbus RTU hardware resource
connect(hardwareManager()->modbusRtuResource(), &ModbusRtuHardwareResource::modbusRtuMasterRemoved, this, [=](const QUuid &modbusUuid){
// FIXME leads to crash, probably an issue in the modbus rtu resource
/*connect(hardwareManager()->modbusRtuResource(), &ModbusRtuHardwareResource::modbusRtuMasterRemoved, this, [=] (const QUuid &modbusUuid){
qCDebug(dcEnergyMeters()) << "Modbus RTU master has been removed" << modbusUuid.toString();
// Check if there is any device using this resource
@ -86,7 +86,7 @@ IntegrationPluginEnergyMeters::IntegrationPluginEnergyMeters()
thing->setStateValue(m_connectionStateTypeIds[thing->thingClassId()], false);
}
}
});
}); */
}
void IntegrationPluginEnergyMeters::discoverThings(ThingDiscoveryInfo *info)
@ -164,6 +164,7 @@ void IntegrationPluginEnergyMeters::setupThing(ThingSetupInfo *info)
m_energyMeters.insert(info->thing(), meter);
info->finish(Thing::ThingErrorNoError);
});
meter->getEnergyConsumed();
return;
} else {
Q_ASSERT_X(false, "setupThing", QString("Unhandled thingClassId: %1").arg(thing->thingClassId().toString()).toUtf8());

1
energymeters/integrationpluginenergymeters.h
View File

@ -73,7 +73,6 @@ private:
QHash<ThingClassId, QHash<ModbusRegisterType, ModbusRegisterDescriptor>> m_registerMaps;
QHash<Thing *, EnergyMeter *> m_energyMeters;
PluginTimer *m_pluginTimer = nullptr;
private slots:
void onConnectionStateChanged(bool status);