Skip to content

LIFX: Small code cleanups #8228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amelchio merged 1 commit into from
Jun 30, 2017
Merged

LIFX: Small code cleanups #8228

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 13 additions & 18 deletions homeassistant/components/light/lifx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,10 @@ def start_effect(self, entities, service, **kwargs):

if service == SERVICE_EFFECT_PULSE:
effect = aiolifx_effects.EffectPulse(
power_on=kwargs.get(ATTR_POWER_ON, None),
period=kwargs.get(ATTR_PERIOD, None),
cycles=kwargs.get(ATTR_CYCLES, None),
mode=kwargs.get(ATTR_MODE, None),
power_on=kwargs.get(ATTR_POWER_ON),
period=kwargs.get(ATTR_PERIOD),
cycles=kwargs.get(ATTR_CYCLES),
mode=kwargs.get(ATTR_MODE),
hsbk=find_hsbk(**kwargs),
)
yield from self.effects_conductor.start(effect, devices)
Expand All @@ -254,11 +254,11 @@ def start_effect(self, entities, service, **kwargs):
brightness = convert_8_to_16(kwargs[ATTR_BRIGHTNESS])

effect = aiolifx_effects.EffectColorloop(
power_on=kwargs.get(ATTR_POWER_ON, None),
period=kwargs.get(ATTR_PERIOD, None),
change=kwargs.get(ATTR_CHANGE, None),
spread=kwargs.get(ATTR_SPREAD, None),
transition=kwargs.get(ATTR_TRANSITION, None),
power_on=kwargs.get(ATTR_POWER_ON),
period=kwargs.get(ATTR_PERIOD),
change=kwargs.get(ATTR_CHANGE),
spread=kwargs.get(ATTR_SPREAD),
transition=kwargs.get(ATTR_TRANSITION),
brightness=brightness,
)
yield from self.effects_conductor.start(effect, devices)
Expand Down Expand Up @@ -335,10 +335,9 @@ def wait(self, method):
self.device = None
self.message = None
self.event.clear()
method(self.callback)
method(callb=self.callback)

yield from self.event.wait()

return self.message


Expand Down Expand Up @@ -382,10 +381,7 @@ def name(self):
@property
def who(self):
"""Return a string identifying the device."""
ip_addr = '-'
if self.device:
ip_addr = self.device.ip_addr[0]
return "%s (%s)" % (ip_addr, self.name)
return "%s (%s)" % (self.device.ip_addr, self.name)

@property
def rgb_color(self):
Expand Down Expand Up @@ -541,9 +537,6 @@ def async_set_state(self, **kwargs):
if power_off:
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
self.update_later(fade)

Expand All @@ -561,4 +554,6 @@ def async_update(self):
"""Update bulb status."""
_LOGGER.debug("%s async_update", self.who)
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)