From 4e09d25296b3d15f492d0690f40c285d886a6b73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <stuerz.simon@gmail.com>
Date: Thu, 28 May 2015 11:17:25 +0200
Subject: [PATCH] fixed hue brightness (0-100 and not 0-255)

---
 .../philipshue/devicepluginphilipshue.cpp     | 21 +++++++++----------
 .../philipshue/huebridgeconnection.cpp        |  2 +-
 plugins/deviceplugins/philipshue/light.cpp    |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/plugins/deviceplugins/philipshue/devicepluginphilipshue.cpp b/plugins/deviceplugins/philipshue/devicepluginphilipshue.cpp
index 7e6d6b3b..44732d75 100644
--- a/plugins/deviceplugins/philipshue/devicepluginphilipshue.cpp
+++ b/plugins/deviceplugins/philipshue/devicepluginphilipshue.cpp
@@ -106,7 +106,7 @@ DeviceManager::DeviceError DevicePluginPhilipsHue::discoverDevices(const DeviceC
 
 DeviceManager::DeviceSetupStatus DevicePluginPhilipsHue::setupDevice(Device *device)
 {
-    //qDebug() << "setupDevice" << device->params();
+    qDebug() << "setupDevice" << device->params();
 
     Light *light = nullptr;
 
@@ -165,21 +165,21 @@ void DevicePluginPhilipsHue::deviceRemoved(Device *device)
 
 void DevicePluginPhilipsHue::upnpDiscoveryFinished(const QList<UpnpDeviceDescriptor> &upnpDeviceDescriptorList)
 {
-    qDebug() << "discovered bridges" << upnpDeviceDescriptorList.count();
-
     foreach (const UpnpDeviceDescriptor &descriptor, upnpDeviceDescriptorList) {
         qDebug() << descriptor;
     }
 
     QList<DeviceDescriptor> deviceDescriptors;
     foreach (const UpnpDeviceDescriptor &upnpDevice, upnpDeviceDescriptorList) {
-        DeviceDescriptor descriptor(hueDeviceClassId, "Philips Hue bridge", upnpDevice.hostAddress().toString());
-        ParamList params;
-        params.append(Param("ip", upnpDevice.hostAddress().toString()));
-        params.append(Param("username", "guh-" + QUuid::createUuid().toString().remove(QRegExp("[\\{\\}]*")).remove(QRegExp("\\-[0-9a-f\\-]*"))));
-        params.append(Param("number", -1));
-        descriptor.setParams(params);
-        deviceDescriptors.append(descriptor);
+        if (upnpDevice.modelDescription().contains("Philips")) {
+            DeviceDescriptor descriptor(hueDeviceClassId, "Philips hue bridge", upnpDevice.hostAddress().toString());
+            ParamList params;
+            params.append(Param("ip", upnpDevice.hostAddress().toString()));
+            params.append(Param("username", "guh-" + QUuid::createUuid().toString().remove(QRegExp("[\\{\\}]*")).remove(QRegExp("\\-[0-9a-f\\-]*"))));
+            params.append(Param("number", -1));
+            descriptor.setParams(params);
+            deviceDescriptors.append(descriptor);
+        }
     }
 
     emit devicesDiscovered(hueDeviceClassId, deviceDescriptors);
@@ -260,7 +260,6 @@ void DevicePluginPhilipsHue::createUserFinished(int id, const QVariant &response
     }
 
     // Paired successfully, check how many lightbulbs there are
-
     int getLightsId = m_bridge->get(QHostAddress(pairingInfo.ipParam.value().toString()), pairingInfo.usernameParam.value().toString(), "lights", this, "getLightsFinished");
     m_pairings.insert(getLightsId, pairingInfo);
 
diff --git a/plugins/deviceplugins/philipshue/huebridgeconnection.cpp b/plugins/deviceplugins/philipshue/huebridgeconnection.cpp
index 3298233b..ec1209b4 100644
--- a/plugins/deviceplugins/philipshue/huebridgeconnection.cpp
+++ b/plugins/deviceplugins/philipshue/huebridgeconnection.cpp
@@ -76,7 +76,7 @@ int HueBridgeConnection::put(const QHostAddress &address, const QString &usernam
 
     QJsonDocument jsonDoc = QJsonDocument::fromVariant(data);
     QByteArray jsonData = jsonDoc.toJson();
-    qDebug() << "putting" << url << jsonData;
+    //qDebug() << "putting" << url << jsonData;
 
     QNetworkReply *reply = m_nam->put(request, jsonData);
     connect(reply, &QNetworkReply::finished, this, &HueBridgeConnection::slotGetFinished);
diff --git a/plugins/deviceplugins/philipshue/light.cpp b/plugins/deviceplugins/philipshue/light.cpp
index b6d913b8..c6cabcfc 100644
--- a/plugins/deviceplugins/philipshue/light.cpp
+++ b/plugins/deviceplugins/philipshue/light.cpp
@@ -313,7 +313,7 @@ void Light::responseReceived(int id, const QVariant &response)
     m_reachable = stateMap.value("reachable").toBool();
     emit stateChanged();
 
-    qDebug() << "got light response" << m_modelId << m_type << m_swversion << m_on << m_bri << m_reachable;
+    //qDebug() << "got light response" << m_modelId << m_type << m_swversion << m_on << m_bri << m_reachable;
 }
 
 void Light::setDescriptionFinished(int id, const QVariant &response)