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

Fix preventing adding the same IP a second time

master
Hermann Detz 2020-11-17 11:17:48 +01:00 committed by Michael Zanetti
parent e202b328b7
commit af93c6c9a0
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
idm/idm.h
View File

@ -74,6 +74,8 @@ public:
/** Destructor */ /** Destructor */
~Idm(); ~Idm();
QHostAddress getIdmAddress() const {return m_hostAddress;};
private: private:
/** Modbus Unit ID of Idm device */ /** Modbus Unit ID of Idm device */

29
idm/integrationpluginidm.cpp
View File

@ -39,7 +39,7 @@ IntegrationPluginIdm::IntegrationPluginIdm()
void IntegrationPluginIdm::discoverThings(ThingDiscoveryInfo *info) void IntegrationPluginIdm::discoverThings(ThingDiscoveryInfo *info)
{ {
if (info->thingClassId() == navigator2ThingClassId) { if (info->thingClassId() == navigator2ThingClassId) {
// TODO Is a discovery method actually needed? // TODO Is a discovery method actually possible?
// The plugin has a parameter for the IP address // The plugin has a parameter for the IP address
QString description = "Navigator 2"; QString description = "Navigator 2";
@ -59,16 +59,29 @@ void IntegrationPluginIdm::setupThing(ThingSetupInfo *info)
if (thing->thingClassId() == navigator2ThingClassId) { if (thing->thingClassId() == navigator2ThingClassId) {
QHostAddress hostAddress = QHostAddress(thing->paramValue(navigator2ThingIpAddressParamTypeId).toString()); QHostAddress hostAddress = QHostAddress(thing->paramValue(navigator2ThingIpAddressParamTypeId).toString());
/* Create new Idm object and store it in hash table */ if (hostAddress.isNull() == false) {
Idm *idm = new Idm(hostAddress, this); /* Check, if address is already in use for another device */
m_idmConnections.insert(thing, idm); bool found = false;
/* Store thing info in hash table */ for (QHash<Thing *, Idm *>::iterator item=m_idmConnections.begin(); item != m_idmConnections.end(); item++) {
m_idmInfos.insert(thing, info); if (hostAddress.isEqual(item.value()->getIdmAddress()))
found = true;
}
info->finish(Thing::ThingErrorNoError); if (found == false) {
/* Create new Idm object and store it in hash table */
Idm *idm = new Idm(hostAddress, this);
m_idmConnections.insert(thing, idm);
/* Store thing info in hash table */
m_idmInfos.insert(thing, info);
info->finish(Thing::ThingErrorNoError);
} else {
info->finish(Thing::ThingErrorThingInUse);
}
}
} }
} }
void IntegrationPluginIdm::postSetupThing(Thing *thing) void IntegrationPluginIdm::postSetupThing(Thing *thing)