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

fixed n-upnp discovery

Browse Source
This commit is contained in:
bernhard.trinnes 2020-06-09 10:42:38 +02:00
parent 14f0519547
commit 1071bcb34b
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
philipshue/integrationpluginphilipshue.cpp
View File

@ -87,14 +87,14 @@ void IntegrationPluginPhilipsHue::init()
QString thingId = thing->paramValue(bridgeThingIdParamTypeId).toString(); QString thingId = thing->paramValue(bridgeThingIdParamTypeId).toString();
if (entry.protocol() == QAbstractSocket::IPv4Protocol) { if (entry.protocol() == QAbstractSocket::IPv4Protocol) {
foreach (const QString &txtEntry, entry.txt()) { QString name = entry.name().split(" - ").first();
QStringList parts = txtEntry.split('='); QString id = entry.name().split(" - ").last();
if (parts.length() == 2 && parts.first() == "uuid" && parts.last() == thingId) {
thing->setParamValue(bridgeThingHostParamTypeId, entry.hostAddress().toString()); if (thingId.contains(id)) {
HueBridge *bridge = m_bridges.key(thing); thing->setParamValue(bridgeThingHostParamTypeId, entry.hostAddress().toString());
bridge->setHostAddress(entry.hostAddress()); HueBridge *bridge = m_bridges.key(thing);
//TODO also add upnp to update the address bridge->setHostAddress(entry.hostAddress());
} //TODO also add upnp to update the address
} }
} }
} }
@ -192,7 +192,7 @@ void IntegrationPluginPhilipsHue::discoverThings(ThingDiscoveryInfo *info)
qCDebug(dcPhilipsHue) << "Starting N-UPNP discovery..."; qCDebug(dcPhilipsHue) << "Starting N-UPNP discovery...";
QNetworkRequest request(QUrl(" https://discovery.meethue.com ")); QNetworkRequest request(QUrl("https://discovery.meethue.com"));
QNetworkReply *nUpnpReply = hardwareManager()->networkManager()->get(request); QNetworkReply *nUpnpReply = hardwareManager()->networkManager()->get(request);
discovery->nUpnpReply = nUpnpReply; discovery->nUpnpReply = nUpnpReply;
@ -1424,9 +1424,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; // 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(); // 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;
@ -1454,7 +1454,7 @@ void IntegrationPluginPhilipsHue::processBridgeSensorDiscoveryResponse(Thing *th
emit autoThingsAppeared({descriptor}); emit autoThingsAppeared({descriptor});
qCDebug(dcPhilipsHue) << "Found new remote" << sensorMap.value("name").toString() << model; qCDebug(dcPhilipsHue) << "Found new remote" << sensorMap.value("name").toString() << model;
// Smart Button // Smart Button
} else if (model == "ROM001") { } else if (model == "ROM001") {
ThingDescriptor descriptor(smartButtonThingClassId, sensorMap.value("name").toString(), "Philips Hue Smart Button", thing->id()); ThingDescriptor descriptor(smartButtonThingClassId, sensorMap.value("name").toString(), "Philips Hue Smart Button", thing->id());
ParamList params; ParamList params;
@ -1466,7 +1466,7 @@ void IntegrationPluginPhilipsHue::processBridgeSensorDiscoveryResponse(Thing *th
emit autoThingsAppeared({descriptor}); emit autoThingsAppeared({descriptor});
qCDebug(dcPhilipsHue) << "Found new smart button" << sensorMap.value("name").toString() << model; qCDebug(dcPhilipsHue) << "Found new smart button" << sensorMap.value("name").toString() << model;
// Hue Tap // Hue Tap
} else if (sensorMap.value("type").toString() == "ZGPSwitch") { } else if (sensorMap.value("type").toString() == "ZGPSwitch") {
ThingDescriptor descriptor(tapThingClassId, sensorMap.value("name").toString(), "Philips Hue Tap", thing->id()); ThingDescriptor descriptor(tapThingClassId, sensorMap.value("name").toString(), "Philips Hue Tap", thing->id());
ParamList params; ParamList params;