frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Merge pull request #538 from ntim/support_for_philips_hue

Browse Source 
Reads hue light ids in case the user did not supply any.

Former-commit-id: 7dc1e6a14c0bd2b08439d13e7e2acf9f539cf1c1
This commit is contained in:
brindosch 2016-03-11 19:08:11 +01:00
commit 9e3b98dfc3
1 changed files with 48 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libsrc/leddevice/LedDevicePhilipsHue.cpp
View File

@ -254,11 +254,19 @@ void LedDevicePhilipsHue::saveStates(unsigned int nLights) {
// Use json parser to parse reponse. // Use json parser to parse reponse.
Json::Reader reader; Json::Reader reader;
Json::FastWriter writer; Json::FastWriter writer;
// Create light ids if none supplied by the user. // Read light ids if none have been supplied by the user.
if (lightIds.size() != nLights) { if (lightIds.size() != nLights) {
lightIds.clear(); QByteArray response = get("lights");
for (unsigned int i = 0; i < nLights; i++) { Json::Value json;
lightIds.push_back(i + 1); if (!reader.parse(QString(response).toStdString(), json)) {
throw std::runtime_error("No lights found");
}
// Loop over all children.
for (Json::ValueIterator it = json.begin(); it != json.end() && lightIds.size() <= nLights; it++) {
int lightId = atoi(it.key().asCString());
lightIds.push_back(lightId);
std::cout << "LedDevicePhilipsHue::saveStates(nLights=" << nLights << "): found light with id " << lightId
<< "." << std::endl;
} }
} }
// Iterate lights. // Iterate lights.
@ -269,6 +277,8 @@ void LedDevicePhilipsHue::saveStates(unsigned int nLights) {
Json::Value json; Json::Value json;
if (!reader.parse(QString(response).toStdString(), json)) { if (!reader.parse(QString(response).toStdString(), json)) {
// Error occured, break loop. // Error occured, break loop.
std::cerr << "LedDevicePhilipsHue::saveStates(nLights=" << nLights
<< "): got invalid response from light with id " << lightIds.at(i) << "." << std::endl;
break; break;
} }
// Get state object values which are subject to change. // Get state object values which are subject to change.