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

fix pairing with hue plugin

Browse Source
This commit is contained in:
Michael Zanetti 2014-06-22 22:02:41 +02:00
parent 9d9b228b88
commit 7a63045999
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/deviceplugins/philipshue/devicepluginphilipshue.cpp
View File

@ -259,14 +259,14 @@ void DevicePluginPhilipsHue::discoveryDone(const QList<QHostAddress> &bridges)
emit devicesDiscovered(hueDeviceClassId, deviceDescriptors); emit devicesDiscovered(hueDeviceClassId, deviceDescriptors);
} }
void DevicePluginPhilipsHue::createUserFinished(int id, const QVariantMap &response) void DevicePluginPhilipsHue::createUserFinished(int id, const QVariant &response)
{ {
qDebug() << "createuser response" << response; qDebug() << "createuser response" << response;
PairingInfo pairingInfo = m_pairings.take(id); PairingInfo pairingInfo = m_pairings.take(id);
if (response.contains("error")) { if (response.toMap().contains("error")) {
qDebug() << "Failed to pair Hue bridge:" << response.value("error").toMap().value("description"); qDebug() << "Failed to pair Hue bridge:" << response.toMap().value("error").toMap().value("description");
emit pairingFinished(pairingInfo.pairingTransactionId, DeviceManager::DeviceSetupStatusFailure, "Pairing failed:" + response.value("error").toMap().value("description").toString()); emit pairingFinished(pairingInfo.pairingTransactionId, DeviceManager::DeviceSetupStatusFailure, "Pairing failed:" + response.toMap().value("error").toMap().value("description").toString());
return; return;
} }
@ -277,19 +277,19 @@ void DevicePluginPhilipsHue::createUserFinished(int id, const QVariantMap &respo
} }
void DevicePluginPhilipsHue::getLightsFinished(int id, const QVariantMap &params) void DevicePluginPhilipsHue::getLightsFinished(int id, const QVariant &params)
{ {
qDebug() << "getlightsfinished" << params; qDebug() << "getlightsfinished" << params;
PairingInfo pairingInfo = m_pairings.take(id); PairingInfo pairingInfo = m_pairings.take(id);
if (params.count() == 0) { if (params.toMap().count() == 0) {
qWarning() << "No light bulbs found on this hue bridge... Cannot proceed with pairing."; qWarning() << "No light bulbs found on this hue bridge... Cannot proceed with pairing.";
emit pairingFinished(pairingInfo.pairingTransactionId, DeviceManager::DeviceSetupStatusFailure, "No light bulbs found on this Hue bridge."); emit pairingFinished(pairingInfo.pairingTransactionId, DeviceManager::DeviceSetupStatusFailure, "No light bulbs found on this Hue bridge.");
return; return;
} }
// Store a list of all known Lights // Store a list of all known Lights
foreach (const QString &lightId, params.keys()) { foreach (const QString &lightId, params.toMap().keys()) {
Light *light = new Light(QHostAddress(pairingInfo.ipParam.value().toString()), pairingInfo.usernameParam.value().toString(), lightId.toInt(), this); Light *light = new Light(QHostAddress(pairingInfo.ipParam.value().toString()), pairingInfo.usernameParam.value().toString(), lightId.toInt(), this);
m_unconfiguredLights.insert(lightId.toInt(), light); m_unconfiguredLights.insert(lightId.toInt(), light);
} }
@ -302,7 +302,7 @@ void DevicePluginPhilipsHue::getLightsFinished(int id, const QVariantMap &params
// } // }
} }
void DevicePluginPhilipsHue::getFinished(int id, const QVariantMap &params) void DevicePluginPhilipsHue::getFinished(int id, const QVariant &params)
{ {
qDebug() << "got lights" << params; qDebug() << "got lights" << params;
} }

6
plugins/deviceplugins/philipshue/devicepluginphilipshue.h
View File

@ -58,9 +58,9 @@ public slots:
private slots: private slots:
void discoveryDone(const QList<QHostAddress> &bridges); void discoveryDone(const QList<QHostAddress> &bridges);
void createUserFinished(int id, const QVariantMap &params); void createUserFinished(int id, const QVariant &params);
void getLightsFinished(int id, const QVariantMap &params); void getLightsFinished(int id, const QVariant &params);
void getFinished(int id, const QVariantMap &params); void getFinished(int id, const QVariant &params);
void lightStateChanged(); void lightStateChanged();