forked from platypush/platypush
Manage hue/sat/bri/ct light ranges on the light entity object itself
This commit is contained in:
parent
b16af0a97f
commit
30a024befb
GPG key ID:
D90FBA7F76362774
2 changed files with 75 additions and 11 deletions
|
|
@ -12,7 +12,18 @@ class Light(Device):
|
||||||
saturation = Column(Float)
|
saturation = Column(Float)
|
||||||
hue = Column(Float)
|
hue = Column(Float)
|
||||||
temperature = Column(Float)
|
temperature = Column(Float)
|
||||||
|
x = Column(Float)
|
||||||
|
y = Column(Float)
|
||||||
colormode = Column(String)
|
colormode = Column(String)
|
||||||
|
effect = Column(String)
|
||||||
|
hue_min = Column(Float)
|
||||||
|
hue_max = Column(Float)
|
||||||
|
saturation_min = Column(Float)
|
||||||
|
saturation_max = Column(Float)
|
||||||
|
brightness_min = Column(Float)
|
||||||
|
brightness_max = Column(Float)
|
||||||
|
temperature_min = Column(Float)
|
||||||
|
temperature_max = Column(Float)
|
||||||
|
|
||||||
__mapper_args__ = {
|
__mapper_args__ = {
|
||||||
'polymorphic_identity': __tablename__,
|
'polymorphic_identity': __tablename__,
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,8 @@ class LightHuePlugin(LightPlugin):
|
||||||
MAX_BRI = 255
|
MAX_BRI = 255
|
||||||
MAX_SAT = 255
|
MAX_SAT = 255
|
||||||
MAX_HUE = 65535
|
MAX_HUE = 65535
|
||||||
|
MIN_CT = 154
|
||||||
|
MAX_CT = 500
|
||||||
ANIMATION_CTRL_QUEUE_NAME = 'platypush/light/hue/AnimationCtrl'
|
ANIMATION_CTRL_QUEUE_NAME = 'platypush/light/hue/AnimationCtrl'
|
||||||
_BRIDGE_RECONNECT_SECONDS = 5
|
_BRIDGE_RECONNECT_SECONDS = 5
|
||||||
_MAX_RECONNECT_TRIES = 5
|
_MAX_RECONNECT_TRIES = 5
|
||||||
|
|
@ -379,6 +381,8 @@ class LightHuePlugin(LightPlugin):
|
||||||
self.bridge = None
|
self.bridge = None
|
||||||
raise e
|
raise e
|
||||||
|
|
||||||
|
return self._get_lights()
|
||||||
|
|
||||||
@action
|
@action
|
||||||
def set_light(self, light, **kwargs):
|
def set_light(self, light, **kwargs):
|
||||||
"""
|
"""
|
||||||
|
|
@ -499,18 +503,20 @@ class LightHuePlugin(LightPlugin):
|
||||||
lights = self.lights
|
lights = self.lights
|
||||||
|
|
||||||
if lights:
|
if lights:
|
||||||
all_lights = self._get_lights().values()
|
all_lights = self._get_lights()
|
||||||
|
|
||||||
lights_on = [
|
lights_on = [
|
||||||
light['name']
|
light['name']
|
||||||
for light in all_lights
|
for light_id, light in all_lights.items()
|
||||||
if light['name'] in lights and light['state']['on'] is True
|
if (light_id in lights or light['name'] in lights)
|
||||||
|
and light['state']['on'] is True
|
||||||
]
|
]
|
||||||
|
|
||||||
lights_off = [
|
lights_off = [
|
||||||
light['name']
|
light['name']
|
||||||
for light in all_lights
|
for light_id, light in all_lights.items()
|
||||||
if light['name'] in lights and light['state']['on'] is False
|
if (light_id in lights or light['name'] in lights)
|
||||||
|
and light['state']['on'] is False
|
||||||
]
|
]
|
||||||
|
|
||||||
if lights_on or groups_on:
|
if lights_on or groups_on:
|
||||||
|
|
@ -606,7 +612,7 @@ class LightHuePlugin(LightPlugin):
|
||||||
"""
|
"""
|
||||||
Set lights/groups color temperature.
|
Set lights/groups color temperature.
|
||||||
|
|
||||||
:param value: Temperature value (range: 0-255)
|
:param value: Temperature value (range: 154-500)
|
||||||
:type value: int
|
:type value: int
|
||||||
:param lights: List of lights.
|
:param lights: List of lights.
|
||||||
:param groups: List of groups.
|
:param groups: List of groups.
|
||||||
|
|
@ -1055,7 +1061,7 @@ class LightHuePlugin(LightPlugin):
|
||||||
LightEntity(
|
LightEntity(
|
||||||
id=entity['id'],
|
id=entity['id'],
|
||||||
name=entity['name'],
|
name=entity['name'],
|
||||||
description=entity['type'],
|
description=entity.get('type'),
|
||||||
on=entity.get('state', {}).get('on', False),
|
on=entity.get('state', {}).get('on', False),
|
||||||
brightness=entity.get('state', {}).get('bri'),
|
brightness=entity.get('state', {}).get('bri'),
|
||||||
saturation=entity.get('state', {}).get('sat'),
|
saturation=entity.get('state', {}).get('sat'),
|
||||||
|
|
@ -1063,10 +1069,57 @@ class LightHuePlugin(LightPlugin):
|
||||||
temperature=entity.get('state', {}).get('ct'),
|
temperature=entity.get('state', {}).get('ct'),
|
||||||
colormode=entity.get('colormode'),
|
colormode=entity.get('colormode'),
|
||||||
reachable=entity.get('reachable'),
|
reachable=entity.get('reachable'),
|
||||||
data={
|
x=entity['state']['xy'][0]
|
||||||
'effect': entity.get('state', {}).get('effect'),
|
if entity.get('state', {}).get('xy')
|
||||||
'xy': entity.get('state', {}).get('xy'),
|
else None,
|
||||||
},
|
y=entity['state']['xy'][1]
|
||||||
|
if entity.get('state', {}).get('xy')
|
||||||
|
else None,
|
||||||
|
effect=entity.get('state', {}).get('effect'),
|
||||||
|
**(
|
||||||
|
{
|
||||||
|
'hue_min': 0,
|
||||||
|
'hue_max': self.MAX_HUE,
|
||||||
|
}
|
||||||
|
if entity.get('state', {}).get('hue') is not None
|
||||||
|
else {
|
||||||
|
'hue_min': None,
|
||||||
|
'hue_max': None,
|
||||||
|
}
|
||||||
|
),
|
||||||
|
**(
|
||||||
|
{
|
||||||
|
'saturation_min': 0,
|
||||||
|
'saturation_max': self.MAX_SAT,
|
||||||
|
}
|
||||||
|
if entity.get('state', {}).get('sat') is not None
|
||||||
|
else {
|
||||||
|
'saturation_min': None,
|
||||||
|
'saturation_max': None,
|
||||||
|
}
|
||||||
|
),
|
||||||
|
**(
|
||||||
|
{
|
||||||
|
'brightness_min': 0,
|
||||||
|
'brightness_max': self.MAX_BRI,
|
||||||
|
}
|
||||||
|
if entity.get('state', {}).get('bri') is not None
|
||||||
|
else {
|
||||||
|
'brightness_min': None,
|
||||||
|
'brightness_max': None,
|
||||||
|
}
|
||||||
|
),
|
||||||
|
**(
|
||||||
|
{
|
||||||
|
'temperature_min': self.MIN_CT,
|
||||||
|
'temperature_max': self.MAX_CT,
|
||||||
|
}
|
||||||
|
if entity.get('state', {}).get('ct') is not None
|
||||||
|
else {
|
||||||
|
'temperature_min': None,
|
||||||
|
'temperature_max': None,
|
||||||
|
}
|
||||||
|
),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue