Merge remote-tracking branch 'origin/master' into dev

* origin/master:
  Fix issue in Timer thread caused by variable name.
  Fix issue with some bulbs missing 'xy' attribute.
This commit is contained in:
Paulus Schoutsen committed 2015-02-21 18:24:10 -08:00
commit b5a3a72b51
2 files changed
+5 -4

No files matched your search

+2 -1
View File
@@ -159,7 +159,8 @@ class HueLight(ToggleDevice):
if self.is_on:
attr[ATTR_BRIGHTNESS] = self.info['state']['bri']
attr[ATTR_XY_COLOR] = self.info['state']['xy']
if 'xy' in self.info['state']:
attr[ATTR_XY_COLOR] = self.info['state']['xy']
return attr