Revert last commit, always display XY colors when colors are available

This commit is contained in:
Stephan Hadinger 2019-04-26 09:19:16 +02:00
parent 6b1efb9abc
commit e4173848b9

View File

@ -631,13 +631,11 @@ void HueLightStatus1(uint8_t device, String *response)
light_status += "\"colormode\":\"" + String(g_gotct ? "ct" : "hs") + "\",";
}
if (LST_RGB <= light_subtype) { // colors
light_status += "\"hue\":" + String(hue) + ",";
light_status += "\"sat\":" + String(sat) + ",";
if (!g_gotct) {
float x, y;
light_state.getXY(&x, &y);
light_status += "\"xy\":[" + String(x, 5) + "," + String(y, 5) + "],";
}
light_status += "\"hue\":" + String(hue) + ",";
light_status += "\"sat\":" + String(sat) + ",";
}
if (LST_COLDWARM == light_subtype || LST_RGBW <= light_subtype) { // white temp
light_status += "\"ct\":" + String(ct > 0 ? ct : 284) + ","; // if no ct, default to medium white