jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-16 17:57:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

LIFX: Small code cleanups (#8228)

Browse Source
This commit is contained in:
Anders Melchiorsen 2017-06-30 02:10:28 +02:00 committed by GitHub
parent 1fb4eefc2c
commit a328df6014
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
homeassistant/components/light/lifx.py
View File

@ -239,10 +239,10 @@ class LIFXManager(object):
if service == SERVICE_EFFECT_PULSE: if service == SERVICE_EFFECT_PULSE:
effect = aiolifx_effects.EffectPulse( effect = aiolifx_effects.EffectPulse(
power_on=kwargs.get(ATTR_POWER_ON, None), power_on=kwargs.get(ATTR_POWER_ON),
period=kwargs.get(ATTR_PERIOD, None), period=kwargs.get(ATTR_PERIOD),
cycles=kwargs.get(ATTR_CYCLES, None), cycles=kwargs.get(ATTR_CYCLES),
mode=kwargs.get(ATTR_MODE, None), mode=kwargs.get(ATTR_MODE),
hsbk=find_hsbk(**kwargs), hsbk=find_hsbk(**kwargs),
) )
yield from self.effects_conductor.start(effect, devices) yield from self.effects_conductor.start(effect, devices)
@ -254,11 +254,11 @@ class LIFXManager(object):
brightness = convert_8_to_16(kwargs[ATTR_BRIGHTNESS]) brightness = convert_8_to_16(kwargs[ATTR_BRIGHTNESS])
effect = aiolifx_effects.EffectColorloop( effect = aiolifx_effects.EffectColorloop(
power_on=kwargs.get(ATTR_POWER_ON, None), power_on=kwargs.get(ATTR_POWER_ON),
period=kwargs.get(ATTR_PERIOD, None), period=kwargs.get(ATTR_PERIOD),
change=kwargs.get(ATTR_CHANGE, None), change=kwargs.get(ATTR_CHANGE),
spread=kwargs.get(ATTR_SPREAD, None), spread=kwargs.get(ATTR_SPREAD),
transition=kwargs.get(ATTR_TRANSITION, None), transition=kwargs.get(ATTR_TRANSITION),
brightness=brightness, brightness=brightness,
) )
yield from self.effects_conductor.start(effect, devices) yield from self.effects_conductor.start(effect, devices)
@ -335,10 +335,9 @@ class AwaitAioLIFX:
self.device = None self.device = None
self.message = None self.message = None
self.event.clear() self.event.clear()
method(self.callback) method(callb=self.callback)
yield from self.event.wait() yield from self.event.wait()
return self.message return self.message
@ -382,10 +381,7 @@ class LIFXLight(Light):
@property @property
def who(self): def who(self):
"""Return a string identifying the device.""" """Return a string identifying the device."""
ip_addr = '-' return "%s (%s)" % (self.device.ip_addr, self.name)
if self.device:
ip_addr = self.device.ip_addr[0]
return "%s (%s)" % (ip_addr, self.name)
@property @property
def rgb_color(self): def rgb_color(self):
@ -541,9 +537,6 @@ class LIFXLight(Light):
if power_off: if power_off:
yield from ack(partial(bulb.set_power, False, duration=fade)) yield from ack(partial(bulb.set_power, False, duration=fade))
# Avoid state ping-pong by holding off updates while the state settles
yield from asyncio.sleep(0.25)
# Schedule an update when the transition is complete # Schedule an update when the transition is complete
self.update_later(fade) self.update_later(fade)
@ -561,4 +554,6 @@ class LIFXLight(Light):
"""Update bulb status.""" """Update bulb status."""
_LOGGER.debug("%s async_update", self.who) _LOGGER.debug("%s async_update", self.who)
if self.available: if self.available:
# Avoid state ping-pong by holding off updates as the state settles
yield from asyncio.sleep(0.25)
yield from AwaitAioLIFX(self).wait(self.device.get_color) yield from AwaitAioLIFX(self).wait(self.device.get_color)