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

flux_led: support for property "available" (#8764)

Browse Source 
* flux_led: support for property "available"

* Implemented changes from code review

* Implemented changes from code review

* Implemented changes from code review
This commit is contained in:
pezinek 2017-08-02 06:26:27 +02:00 committed by Paulus Schoutsen
parent 6ff340492b
commit 7dbcf63543
1 changed files with 70 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
homeassistant/components/light/flux_led.py
View File

@ -53,28 +53,32 @@ EFFECT_PURPLE_STROBE = 'purple_strobe'
EFFECT_WHITE_STROBE = 'white_strobe' EFFECT_WHITE_STROBE = 'white_strobe'
EFFECT_COLORJUMP = 'colorjump' EFFECT_COLORJUMP = 'colorjump'
EFFECT_MAP = {
EFFECT_COLORLOOP: 0x25,
EFFECT_RED_FADE: 0x26,
EFFECT_GREEN_FADE: 0x27,
EFFECT_BLUE_FADE: 0x28,
EFFECT_YELLOW_FADE: 0x29,
EFFECT_CYAN_FADE: 0x2a,
EFFECT_PURPLE_FADE: 0x2b,
EFFECT_WHITE_FADE: 0x2c,
EFFECT_RED_GREEN_CROSS_FADE: 0x2d,
EFFECT_RED_BLUE_CROSS_FADE: 0x2e,
EFFECT_GREEN_BLUE_CROSS_FADE: 0x2f,
EFFECT_COLORSTROBE: 0x30,
EFFECT_RED_STROBE: 0x31,
EFFECT_GREEN_STROBE: 0x32,
EFFECT_BLUE_STOBE: 0x33,
EFFECT_YELLOW_STROBE: 0x34,
EFFECT_CYAN_STROBE: 0x35,
EFFECT_PURPLE_STROBE: 0x36,
EFFECT_WHITE_STROBE: 0x37,
EFFECT_COLORJUMP: 0x38
}
FLUX_EFFECT_LIST = [ FLUX_EFFECT_LIST = [
EFFECT_COLORLOOP,
EFFECT_RANDOM, EFFECT_RANDOM,
EFFECT_RED_FADE, ].extend(EFFECT_MAP.keys())
EFFECT_GREEN_FADE,
EFFECT_BLUE_FADE,
EFFECT_YELLOW_FADE,
EFFECT_CYAN_FADE,
EFFECT_PURPLE_FADE,
EFFECT_WHITE_FADE,
EFFECT_RED_GREEN_CROSS_FADE,
EFFECT_RED_BLUE_CROSS_FADE,
EFFECT_GREEN_BLUE_CROSS_FADE,
EFFECT_COLORSTROBE,
EFFECT_RED_STROBE,
EFFECT_GREEN_STROBE,
EFFECT_BLUE_STOBE,
EFFECT_YELLOW_STROBE,
EFFECT_CYAN_STROBE,
EFFECT_PURPLE_STROBE,
EFFECT_WHITE_STROBE,
EFFECT_COLORJUMP]
DEVICE_SCHEMA = vol.Schema({ DEVICE_SCHEMA = vol.Schema({
vol.Optional(CONF_NAME): cv.string, vol.Optional(CONF_NAME): cv.string,
@ -103,12 +107,11 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
device[CONF_PROTOCOL] = device_config[CONF_PROTOCOL] device[CONF_PROTOCOL] = device_config[CONF_PROTOCOL]
device[ATTR_MODE] = device_config[ATTR_MODE] device[ATTR_MODE] = device_config[ATTR_MODE]
light = FluxLight(device) light = FluxLight(device)
if light.is_valid:
lights.append(light) lights.append(light)
light_ips.append(ipaddr) light_ips.append(ipaddr)
if not config.get(CONF_AUTOMATIC_ADD, False): if not config.get(CONF_AUTOMATIC_ADD, False):
add_devices(lights) add_devices(lights, True)
return return
# Find the bulbs on the LAN # Find the bulbs on the LAN
@ -122,11 +125,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
device[ATTR_MODE] = 'rgbw' device[ATTR_MODE] = 'rgbw'
device[CONF_PROTOCOL] = None device[CONF_PROTOCOL] = None
light = FluxLight(device) light = FluxLight(device)
if light.is_valid:
lights.append(light) lights.append(light)
light_ips.append(ipaddr)
add_devices(lights) add_devices(lights, True)
class FluxLight(Light): class FluxLight(Light):
@ -134,17 +135,18 @@ class FluxLight(Light):
def __init__(self, device): def __init__(self, device):
"""Initialize the light.""" """Initialize the light."""
import flux_led
self._name = device['name'] self._name = device['name']
self._ipaddr = device['ipaddr'] self._ipaddr = device['ipaddr']
self._protocol = device[CONF_PROTOCOL] self._protocol = device[CONF_PROTOCOL]
self._mode = device[ATTR_MODE] self._mode = device[ATTR_MODE]
self.is_valid = True
self._bulb = None self._bulb = None
self._error_reported = False
try: def _connect(self):
self._bulb = flux_led.WifiLedBulb(self._ipaddr) """Connect to Flux light."""
import flux_led
self._bulb = flux_led.WifiLedBulb(self._ipaddr, timeout=5)
if self._protocol: if self._protocol:
self._bulb.setProtocol(self._protocol) self._bulb.setProtocol(self._protocol)
@ -156,10 +158,14 @@ class FluxLight(Light):
else: else:
self._mode = MODE_RGB self._mode = MODE_RGB
except socket.error: def _disconnect(self):
self.is_valid = False """Disconnect from Flux light."""
_LOGGER.error( self._bulb = None
"Failed to connect to bulb %s, %s", self._ipaddr, self._name)
@property
def available(self) -> bool:
"""Return True if entity is available."""
return self._bulb is not None
@property @property
def unique_id(self): def unique_id(self):
@ -204,6 +210,7 @@ class FluxLight(Light):
rgb = kwargs.get(ATTR_RGB_COLOR) rgb = kwargs.get(ATTR_RGB_COLOR)
brightness = kwargs.get(ATTR_BRIGHTNESS) brightness = kwargs.get(ATTR_BRIGHTNESS)
effect = kwargs.get(ATTR_EFFECT) effect = kwargs.get(ATTR_EFFECT)
if rgb is not None and brightness is not None: if rgb is not None and brightness is not None:
self._bulb.setRgb(*tuple(rgb), brightness=brightness) self._bulb.setRgb(*tuple(rgb), brightness=brightness)
elif rgb is not None: elif rgb is not None:
@ -218,46 +225,8 @@ class FluxLight(Light):
self._bulb.setRgb(random.randint(0, 255), self._bulb.setRgb(random.randint(0, 255),
random.randint(0, 255), random.randint(0, 255),
random.randint(0, 255)) random.randint(0, 255))
elif effect == EFFECT_COLORLOOP: elif effect in EFFECT_MAP:
self._bulb.setPresetPattern(0x25, 50) self._bulb.setPresetPattern(EFFECT_MAP[effect], 50)
elif effect == EFFECT_RED_FADE:
self._bulb.setPresetPattern(0x26, 50)
elif effect == EFFECT_GREEN_FADE:
self._bulb.setPresetPattern(0x27, 50)
elif effect == EFFECT_BLUE_FADE:
self._bulb.setPresetPattern(0x28, 50)
elif effect == EFFECT_YELLOW_FADE:
self._bulb.setPresetPattern(0x29, 50)
elif effect == EFFECT_CYAN_FADE:
self._bulb.setPresetPattern(0x2a, 50)
elif effect == EFFECT_PURPLE_FADE:
self._bulb.setPresetPattern(0x2b, 50)
elif effect == EFFECT_WHITE_FADE:
self._bulb.setPresetPattern(0x2c, 50)
elif effect == EFFECT_RED_GREEN_CROSS_FADE:
self._bulb.setPresetPattern(0x2d, 50)
elif effect == EFFECT_RED_BLUE_CROSS_FADE:
self._bulb.setPresetPattern(0x2e, 50)
elif effect == EFFECT_GREEN_BLUE_CROSS_FADE:
self._bulb.setPresetPattern(0x2f, 50)
elif effect == EFFECT_COLORSTROBE:
self._bulb.setPresetPattern(0x30, 50)
elif effect == EFFECT_RED_STROBE:
self._bulb.setPresetPattern(0x31, 50)
elif effect == EFFECT_GREEN_STROBE:
self._bulb.setPresetPattern(0x32, 50)
elif effect == EFFECT_BLUE_STOBE:
self._bulb.setPresetPattern(0x33, 50)
elif effect == EFFECT_YELLOW_STROBE:
self._bulb.setPresetPattern(0x34, 50)
elif effect == EFFECT_CYAN_STROBE:
self._bulb.setPresetPattern(0x35, 50)
elif effect == EFFECT_PURPLE_STROBE:
self._bulb.setPresetPattern(0x36, 50)
elif effect == EFFECT_WHITE_STROBE:
self._bulb.setPresetPattern(0x37, 50)
elif effect == EFFECT_COLORJUMP:
self._bulb.setPresetPattern(0x38, 50)
def turn_off(self, **kwargs): def turn_off(self, **kwargs):
"""Turn the specified or all lights off.""" """Turn the specified or all lights off."""
@ -265,4 +234,16 @@ class FluxLight(Light):
def update(self): def update(self):
"""Synchronize state with bulb.""" """Synchronize state with bulb."""
self._bulb.refreshState() if not self.available:
try:
self._connect()
self._error_reported = False
except socket.error:
self._disconnect()
if not self._error_reported:
_LOGGER.warning("Failed to connect to bulb %s, %s",
self._ipaddr, self._name)
self._error_reported = True
return
self._bulb.update_state(retry=2)