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

Add support for fluxled discovery. (#5784)

Browse Source 
* Add support for fluxled discovery.

* Make use of device type/protocol auto detection.
This commit is contained in:
Johan Bloemberg 2017-02-08 06:49:36 +01:00 committed by Paulus Schoutsen
parent 490ef6afad
commit 0e6dd39c15
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
homeassistant/components/discovery.py
View File

@ -39,6 +39,7 @@ SERVICE_HANDLERS = {
'denonavr': ('media_player', 'denonavr'), 'denonavr': ('media_player', 'denonavr'),
'samsung_tv': ('media_player', 'samsungtv'), 'samsung_tv': ('media_player', 'samsungtv'),
'yeelight': ('light', 'yeelight'), 'yeelight': ('light', 'yeelight'),
'flux_led': ('light', 'flux_led'),
} }
CONFIG_SCHEMA = vol.Schema({ CONFIG_SCHEMA = vol.Schema({

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

@ -29,10 +29,13 @@ DOMAIN = 'flux_led'
SUPPORT_FLUX_LED = (SUPPORT_BRIGHTNESS | SUPPORT_EFFECT | SUPPORT_FLUX_LED = (SUPPORT_BRIGHTNESS | SUPPORT_EFFECT |
SUPPORT_RGB_COLOR) SUPPORT_RGB_COLOR)
MODE_RGB = 'rgb'
MODE_RGBW = 'rgbw'
DEVICE_SCHEMA = vol.Schema({ DEVICE_SCHEMA = vol.Schema({
vol.Optional(CONF_NAME): cv.string, vol.Optional(CONF_NAME): cv.string,
vol.Optional(ATTR_MODE, default='rgbw'): vol.Optional(ATTR_MODE, default=MODE_RGBW):
vol.All(cv.string, vol.In(['rgbw', 'rgb'])), vol.All(cv.string, vol.In([MODE_RGBW, MODE_RGB])),
vol.Optional(CONF_PROTOCOL, default=None): vol.Optional(CONF_PROTOCOL, default=None):
vol.All(cv.string, vol.In(['ledenet'])), vol.All(cv.string, vol.In(['ledenet'])),
}) })
@ -48,7 +51,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
import flux_led import flux_led
lights = [] lights = []
light_ips = [] light_ips = []
for ipaddr, device_config in config[CONF_DEVICES].items():
for ipaddr, device_config in config.get(CONF_DEVICES, {}).items():
device = {} device = {}
device['name'] = device_config[CONF_NAME] device['name'] = device_config[CONF_NAME]
device['ipaddr'] = ipaddr device['ipaddr'] = ipaddr
@ -59,7 +63,21 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
lights.append(light) lights.append(light)
light_ips.append(ipaddr) light_ips.append(ipaddr)
if not config[CONF_AUTOMATIC_ADD]: if discovery_info:
device = {}
# discovery_info: ip address,device id,device type
device['ipaddr'] = discovery_info[0]
device['name'] = discovery_info[1]
# As we don't know protocol and mode set to none to autodetect.
device[CONF_PROTOCOL] = None
device[ATTR_MODE] = None
light = FluxLight(device)
if light.is_valid:
lights.append(light)
light_ips.append(device['ipaddr'])
if not config.get(CONF_AUTOMATIC_ADD, False):
add_devices(lights) add_devices(lights)
return return
@ -94,10 +112,20 @@ class FluxLight(Light):
self._mode = device[ATTR_MODE] self._mode = device[ATTR_MODE]
self.is_valid = True self.is_valid = True
self._bulb = None self._bulb = None
try: try:
self._bulb = flux_led.WifiLedBulb(self._ipaddr) self._bulb = flux_led.WifiLedBulb(self._ipaddr)
if self._protocol: if self._protocol:
self._bulb.setProtocol(self._protocol) self._bulb.setProtocol(self._protocol)
# After bulb object is created the status is updated. We can
# now set the correct mode if it was not explicitly defined.
if not self._mode:
if self._bulb.rgbwcapable:
self._mode = MODE_RGBW
else:
self._mode = MODE_RGB
except socket.error: except socket.error:
self.is_valid = False self.is_valid = False
_LOGGER.error( _LOGGER.error(