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

Fix setting uuid

Browse Source
This commit is contained in:
Michael Zanetti 2020-04-03 00:09:03 +02:00
parent 35920a206e
commit 686a595d8f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
philipshue/integrationpluginphilipshue.cpp
View File

@ -414,6 +414,7 @@ void IntegrationPluginPhilipsHue::setupThing(ThingSetupInfo *info)
hueTap->setName(thing->name()); hueTap->setName(thing->name());
hueTap->setId(thing->paramValue(tapThingSensorIdParamTypeId).toInt()); hueTap->setId(thing->paramValue(tapThingSensorIdParamTypeId).toInt());
hueTap->setModelId(thing->paramValue(tapThingModelIdParamTypeId).toString()); hueTap->setModelId(thing->paramValue(tapThingModelIdParamTypeId).toString());
hueTap->setUuid(thing->paramValue(tapThingUuidParamTypeId).toString());
connect(hueTap, &HueRemote::stateChanged, this, &IntegrationPluginPhilipsHue::remoteStateChanged); connect(hueTap, &HueRemote::stateChanged, this, &IntegrationPluginPhilipsHue::remoteStateChanged);
connect(hueTap, &HueRemote::buttonPressed, this, &IntegrationPluginPhilipsHue::onRemoteButtonEvent); connect(hueTap, &HueRemote::buttonPressed, this, &IntegrationPluginPhilipsHue::onRemoteButtonEvent);
@ -428,6 +429,7 @@ void IntegrationPluginPhilipsHue::setupThing(ThingSetupInfo *info)
smartButton->setName(thing->name()); smartButton->setName(thing->name());
smartButton->setId(thing->paramValue(smartButtonThingSensorIdParamTypeId).toInt()); smartButton->setId(thing->paramValue(smartButtonThingSensorIdParamTypeId).toInt());
smartButton->setModelId(thing->paramValue(smartButtonThingModelIdParamTypeId).toString()); smartButton->setModelId(thing->paramValue(smartButtonThingModelIdParamTypeId).toString());
smartButton->setUuid(thing->paramValue(smartButtonThingUuidParamTypeId).toString());
connect(smartButton, &HueRemote::stateChanged, this, &IntegrationPluginPhilipsHue::remoteStateChanged); connect(smartButton, &HueRemote::stateChanged, this, &IntegrationPluginPhilipsHue::remoteStateChanged);
connect(smartButton, &HueRemote::buttonPressed, this, &IntegrationPluginPhilipsHue::onRemoteButtonEvent); connect(smartButton, &HueRemote::buttonPressed, this, &IntegrationPluginPhilipsHue::onRemoteButtonEvent);
@ -1369,7 +1371,9 @@ void IntegrationPluginPhilipsHue::processBridgeSensorDiscoveryResponse(Thing *th
QString uuid = sensorMap.value("uniqueid").toString(); QString uuid = sensorMap.value("uniqueid").toString();
QString model = sensorMap.value("modelid").toString(); QString model = sensorMap.value("modelid").toString();
qCDebug(dcPhilipsHue()) << "Found sensor on bridge:" << model << uuid;
foreach (HueRemote* remote, remotesToRemove) { foreach (HueRemote* remote, remotesToRemove) {
qCDebug(dcPhilipsHue()) << " - Checking remote to remove" << remote->modelId() << remote->uuid();
if (remote->uuid() == uuid) { if (remote->uuid() == uuid) {
remotesToRemove.removeAll(remote); remotesToRemove.removeAll(remote);
break; break;
@ -1541,7 +1545,7 @@ void IntegrationPluginPhilipsHue::processBridgeSensorDiscoveryResponse(Thing *th
foreach (HueRemote* remote, remotesToRemove) { foreach (HueRemote* remote, remotesToRemove) {
Thing *remoteThing = m_remotes.value(remote); Thing *remoteThing = m_remotes.value(remote);
if (remoteThing->parentId() == thing->id()) { if (remoteThing->parentId() == thing->id()) {
qCDebug(dcPhilipsHue()) << "Hue remote disappeared from bridge"; qCDebug(dcPhilipsHue()) << "Hue remote" << remote->uuid() << "disappeared from bridge";
emit autoThingDisappeared(remoteThing->id()); emit autoThingDisappeared(remoteThing->id());
} }
} }