Fix incorrect detection of LIFX white bulbs

Signed-off-by: Avi Miller <me@dje.li>

Author: Djelibeybi

aiolifx_effects/aiolifx_effects.py

@@ -1,8 +1,9 @@
 import asyncio
+from functools import partial
 import random
+
 from aiolifx.aiolifx import features_map
 
-from functools import partial
 
 # aiolifx waveform modes
 WAVEFORM_SINE = 1
@@ -13,10 +14,11 @@
 
 def lifx_white(device):
     """Return true if the device supports neither color nor temperature range."""
-    return bool(
-        features_map[device.product]["color"] is False
-        and features_map[device.product]["temperature_range"] is None
-    )
+    max_kelvin = features_map[device.product].get("max_kelvin", None)
+    min_kelvin = features_map[device.product].get("min_kelvin", None)
+
+    if max_kelvin is not None and min_kelvin is not None:
+        return bool(max_kelvin == min_kelvin)
 
 
 def has_extended_multizone(device):
@@ -94,6 +96,9 @@ async def start(self, effect, participants):
             # Remember the current state
             tasks = []
             for device in participants:
+                if device.version is None:
+                    response = await AwaitAioLIFX().wait(device.get_version)
+                    device.product = response.product
                 if not self.running.get(device.mac_addr):
                     tasks.append(AwaitAioLIFX().wait(device.get_color))
                     if device.color_zones:

examples/colorloop.py

@@ -16,7 +16,7 @@ def register(self, bulb):
     def unregister(self, bulb):
         del self.bulbs[bulb.mac_addr]
 
-loop = asyncio.get_event_loop()
+loop = asyncio.get_event_loop_policy().get_event_loop()
 
 conductor = aiolifx_effects.Conductor(loop=loop)
 

examples/pulse.py

@@ -0,0 +1,46 @@
+#!/usr/bin/env python3
+
+import asyncio
+from functools import partial
+
+import aiolifx
+import aiolifx_effects
+
+class Bulbs:
+    def __init__(self):
+        self.bulbs = {}
+
+    def register(self, bulb):
+        self.bulbs[bulb.mac_addr] = bulb
+
+    def unregister(self, bulb):
+        del self.bulbs[bulb.mac_addr]
+
+loop = asyncio.get_event_loop_policy().get_event_loop()
+
+conductor = aiolifx_effects.Conductor(loop=loop)
+
+mybulbs = Bulbs()
+
+discover = loop.create_datagram_endpoint(
+    partial(aiolifx.LifxDiscovery, loop, mybulbs),
+    local_addr=('0.0.0.0', 56700))
+
+loop.create_task(discover)
+
+# Probe
+sleep = loop.create_task(asyncio.sleep(3))
+loop.run_until_complete(sleep)
+
+# Run effect
+devices = list(mybulbs.bulbs.values())
+effect = aiolifx_effects.EffectPulse(power_on=True, mode="blink", cycles=3)
+loop.create_task(conductor.start(effect, devices))
+
+# Stop effect in a while
+stop = conductor.stop(devices)
+loop.call_later(3, lambda: loop.create_task(stop))
+
+# Wait for completion
+sleep = loop.create_task(asyncio.sleep(4))
+loop.run_until_complete(sleep)

setup.py

@@ -5,7 +5,7 @@
 setup(
     name='aiolifx_effects',
     packages=['aiolifx_effects'],
-    version='0.3.0',
+    version='0.3.1',
     install_requires=['aiolifx>=0.8.6'],
     description='aiolifx light effects',
     author='Anders Melchiorsen',