Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate devices insertion

pull/483/head
badele 2015-09-27 23:51:19 +02:00
parent 321a603bfe
commit 174aeacd76
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
homeassistant/components/light/rfxtrx.py
View File

@ -36,24 +36,30 @@ DOMAIN = "rfxtrx"
def setup_platform(hass, config, add_devices_callback, discovery_info=None): def setup_platform(hass, config, add_devices_callback, discovery_info=None):
""" Setup the RFXtrx platform. """ """ Setup the RFXtrx platform. """
logger = logging.getLogger(__name__)
# Add light from config file # Add light from config file
lights = []
devices = config.get('devices') devices = config.get('devices')
for entity_id, entity_name in devices.items(): for entity_id, entity_name in devices.items():
if entity_id not in rfxtrx.RFX_DEVICES: if entity_id not in rfxtrx.RFX_DEVICES:
logger.info("Add %s rfxtrx.light" % entity_name)
new_light = RfxtrxLight(entity_name, False) new_light = RfxtrxLight(entity_name, False)
rfxtrx.RFX_DEVICES[entity_id] = new_light rfxtrx.RFX_DEVICES[entity_id] = new_light
lights.append(new_light)
add_devices_callback(rfxtrx.RFX_DEVICES.values()) add_devices_callback(lights)
def light_update(event): def light_update(event):
""" Callback for sensor updates from the RFXtrx gateway. """ """ Callback for sensor updates from the RFXtrx gateway. """
if isinstance(event.device, LightingDevice): if isinstance(event.device, LightingDevice):
entity_id = '%s-%s' % (event.device.type_string.lower(), slugify(event.device.id_string.lower())) entity_id = slugify(event.device.id_string.lower())
# Add entity if not exist and the automatic_add is True # Add entity if not exist and the automatic_add is True
if entity_id not in rfxtrx.RFX_DEVICES: if entity_id not in rfxtrx.RFX_DEVICES:
automatic_add = config.get('automatic_add', False) automatic_add = config.get('automatic_add', False)
if automatic_add: if automatic_add:
logger.info("Automatic add %s rfxtrx.light" % entity_name)
new_light = RfxtrxLight(entity_id, False) new_light = RfxtrxLight(entity_id, False)
rfxtrx.RFX_DEVICES[entity_id] = new_light rfxtrx.RFX_DEVICES[entity_id] = new_light
add_devices_callback([new_light]) add_devices_callback([new_light])

10
homeassistant/components/switch/rfxtrx.py
View File

@ -36,24 +36,30 @@ DOMAIN = "rfxtrx"
def setup_platform(hass, config, add_devices_callback, discovery_info=None): def setup_platform(hass, config, add_devices_callback, discovery_info=None):
""" Setup the RFXtrx platform. """ """ Setup the RFXtrx platform. """
logger = logging.getLogger(__name__)
# Add switch from config file # Add switch from config file
switchs = []
devices = config.get('devices') devices = config.get('devices')
for entity_id, entity_name in devices.items(): for entity_id, entity_name in devices.items():
if entity_id not in rfxtrx.RFX_DEVICES: if entity_id not in rfxtrx.RFX_DEVICES:
logger.info("Add %s rfxtrx.switch" % entity_name)
new_switch = RfxtrxSwitch(entity_name, False) new_switch = RfxtrxSwitch(entity_name, False)
rfxtrx.RFX_DEVICES[entity_id] = new_switch rfxtrx.RFX_DEVICES[entity_id] = new_switch
switchs.append(new_switch)
add_devices_callback(rfxtrx.RFX_DEVICES.values()) add_devices_callback(switchs)
def switch_update(event): def switch_update(event):
""" Callback for sensor updates from the RFXtrx gateway. """ """ Callback for sensor updates from the RFXtrx gateway. """
if isinstance(event.device, LightingDevice): if isinstance(event.device, LightingDevice):
entity_id = '%s-%s' % (event.device.type_string.lower(), slugify(event.device.id_string.lower())) entity_id = slugify(event.device.id_string.lower())
# Add entity if not exist and the automatic_add is True # Add entity if not exist and the automatic_add is True
if entity_id not in rfxtrx.RFX_DEVICES: if entity_id not in rfxtrx.RFX_DEVICES:
automatic_add = config.get('automatic_add', False) automatic_add = config.get('automatic_add', False)
if automatic_add: if automatic_add:
logger.info("Automatic add %s rfxtrx.switch" % entity_name)
new_switch = RfxtrxSwitch(entity_id, False) new_switch = RfxtrxSwitch(entity_id, False)
rfxtrx.RFX_DEVICES[entity_id] = new_switch rfxtrx.RFX_DEVICES[entity_id] = new_switch
add_devices_callback([new_switch]) add_devices_callback([new_switch])