evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add hass to rfxtrx object (#6844)

Browse source
This commit is contained in:
Daniel Høyer Iversen 2017-05-05 08:50:53 +02:00 • committed by Paulus Schoutsen
parent 03e3fb77c4
commit 94f7c397d7
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
homeassistant/components/cover/rfxtrx.py
View file

@ -16,7 +16,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
"""Set up the RFXtrx cover.""" """Set up the RFXtrx cover."""
import RFXtrx as rfxtrxmod import RFXtrx as rfxtrxmod
covers = rfxtrx.get_devices_from_config(config, RfxtrxCover) covers = rfxtrx.get_devices_from_config(config, RfxtrxCover, hass)
add_devices_callback(covers) add_devices_callback(covers)
def cover_update(event): def cover_update(event):
@ -26,7 +26,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
not event.device.known_to_be_rollershutter: not event.device.known_to_be_rollershutter:
return return
new_device = rfxtrx.get_new_device(event, config, RfxtrxCover) new_device = rfxtrx.get_new_device(event, config, RfxtrxCover, hass)
if new_device: if new_device:
add_devices_callback([new_device]) add_devices_callback([new_device])

4
homeassistant/components/light/rfxtrx.py
View file

@ -23,7 +23,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
"""Set up the RFXtrx platform.""" """Set up the RFXtrx platform."""
import RFXtrx as rfxtrxmod import RFXtrx as rfxtrxmod
lights = rfxtrx.get_devices_from_config(config, RfxtrxLight) lights = rfxtrx.get_devices_from_config(config, RfxtrxLight, hass)
add_devices(lights) add_devices(lights)
def light_update(event): def light_update(event):
@ -32,7 +32,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
not event.device.known_to_be_dimmable: not event.device.known_to_be_dimmable:
return return
new_device = rfxtrx.get_new_device(event, config, RfxtrxLight) new_device = rfxtrx.get_new_device(event, config, RfxtrxLight, hass)
if new_device: if new_device:
add_devices([new_device]) add_devices([new_device])

6
homeassistant/components/rfxtrx.py
View file

@ -191,7 +191,7 @@ def get_rfx_object(packetid):
return obj return obj
def get_devices_from_config(config, device): def get_devices_from_config(config, device, hass):
"""Read rfxtrx configuration.""" """Read rfxtrx configuration."""
signal_repetitions = config[CONF_SIGNAL_REPETITIONS] signal_repetitions = config[CONF_SIGNAL_REPETITIONS]
@ -209,12 +209,13 @@ def get_devices_from_config(config, device):
new_device = device(entity_info[ATTR_NAME], event, datas, new_device = device(entity_info[ATTR_NAME], event, datas,
signal_repetitions) signal_repetitions)
new_device.hass = hass
RFX_DEVICES[device_id] = new_device RFX_DEVICES[device_id] = new_device
devices.append(new_device) devices.append(new_device)
return devices return devices
def get_new_device(event, config, device): def get_new_device(event, config, device, hass):
"""Add entity if not exist and the automatic_add is True.""" """Add entity if not exist and the automatic_add is True."""
device_id = slugify(event.device.id_string.lower()) device_id = slugify(event.device.id_string.lower())
if device_id in RFX_DEVICES: if device_id in RFX_DEVICES:
@ -235,6 +236,7 @@ def get_new_device(event, config, device):
signal_repetitions = config[CONF_SIGNAL_REPETITIONS] signal_repetitions = config[CONF_SIGNAL_REPETITIONS]
new_device = device(pkt_id, event, datas, new_device = device(pkt_id, event, datas,
signal_repetitions) signal_repetitions)
new_device.hass = hass
RFX_DEVICES[device_id] = new_device RFX_DEVICES[device_id] = new_device
return new_device return new_device

4
homeassistant/components/switch/rfxtrx.py
View file

@ -21,7 +21,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
import RFXtrx as rfxtrxmod import RFXtrx as rfxtrxmod
# Add switch from config file # Add switch from config file
switches = rfxtrx.get_devices_from_config(config, RfxtrxSwitch) switches = rfxtrx.get_devices_from_config(config, RfxtrxSwitch, hass)
add_devices_callback(switches) add_devices_callback(switches)
def switch_update(event): def switch_update(event):
@ -31,7 +31,7 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
event.device.known_to_be_rollershutter: event.device.known_to_be_rollershutter:
return return
new_device = rfxtrx.get_new_device(event, config, RfxtrxSwitch) new_device = rfxtrx.get_new_device(event, config, RfxtrxSwitch, hass)
if new_device: if new_device:
add_devices_callback([new_device]) add_devices_callback([new_device])