Add a light & switch rfxtrx support

homeassistant/components/light/rfxtrx.py

@@ -0,0 +1,102 @@
+"""
+homeassistant.components.light.rfxtrx
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Support for Rfxtrx lights.
+
+Configuration:
+
+To use Rfxtrx lights you will need to add the following to your
+configuration.yaml file.
+
+light:
+  platform: rfxtrx
+
+  devices:
+    ac09c4f1: Bedroom Light
+    ac09c4f2: Kitchen Light
+    ac09c4f3: Bathroom Light
+
+*Optional*
+
+  # Automatic add new light
+  automatic_add: True
+
+"""
+import logging
+import homeassistant.components.rfxtrx as rfxtrx
+from RFXtrx import LightingDevice
+
+from homeassistant.components.light import Light
+from homeassistant.util import slugify
+
+REQUIREMENTS = ['https://github.com/Danielhiversen/pyRFXtrx/archive/' +
+                'ec7a1aaddf8270db6e5da1c13d58c1547effd7cf.zip#RFXtrx==0.15']
+
+DOMAIN = "rfxtrx"
+
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+    """ Setup the RFXtrx platform. """
+    # Add light from config file
+    devices = config.get('devices')
+    for entity_id, entity_name in devices.items():
+        if entity_id not in rfxtrx.RFX_DEVICES:
+            new_light = RfxtrxLight(entity_name, False)
+            rfxtrx.RFX_DEVICES[entity_id] = new_light
+
+    add_devices_callback(rfxtrx.RFX_DEVICES.values())
+
+    def light_update(event):
+        """ Callback for sensor updates from the RFXtrx gateway. """
+        if isinstance(event.device, LightingDevice):
+            entity_id = '%s-%s' % (event.device.type_string.lower(), slugify(event.device.id_string.lower()))
+
+            # Add entity if not exist and the automatic_add is True
+            if entity_id not in rfxtrx.RFX_DEVICES:
+                automatic_add = config.get('automatic_add', False)
+                if automatic_add:
+                    new_light = RfxtrxLight(entity_id, False)
+                    rfxtrx.RFX_DEVICES[entity_id] = new_light
+                    add_devices_callback([new_light])
+
+            # Check if entity exists (previous automatic added)
+            if entity_id in rfxtrx.RFX_DEVICES:
+                if event.values['Command'] == 'On' or event.values['Command'] == 'Off':
+                    if event.values['Command'] == 'On':
+                        rfxtrx.RFX_DEVICES[entity_id].turn_on()
+                    else:
+                        rfxtrx.RFX_DEVICES[entity_id].turn_off()
+
+    if light_update not in rfxtrx.RECEIVED_EVT_SUBSCRIBERS:
+        rfxtrx.RECEIVED_EVT_SUBSCRIBERS.append(light_update)
+
+
+class RfxtrxLight(Light):
+    """ Provides a demo switch. """
+    def __init__(self, name, state):
+        self._name = name
+        self._state = state
+
+    @property
+    def should_poll(self):
+        """ No polling needed for a demo light. """
+        return False
+
+    @property
+    def name(self):
+        """ Returns the name of the device if any. """
+        return self._name
+
+    @property
+    def is_on(self):
+        """ True if device is on. """
+        return self._state
+
+    def turn_on(self, **kwargs):
+        """ Turn the device on. """
+        self._state = True
+        self.update_ha_state()
+
+    def turn_off(self, **kwargs):
+        """ Turn the device off. """
+        self._state = False
+        self.update_ha_state()

homeassistant/components/rfxtrx.py

@@ -0,0 +1,41 @@
+"""
+homeassistant.components.rfxtrx
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Connects Home Assistant to a RFXtrx device.
+"""
+
+import logging
+
+DEPENDENCIES = []
+REQUIREMENTS = ['https://github.com/Danielhiversen/pyRFXtrx/archive/' +
+                'ec7a1aaddf8270db6e5da1c13d58c1547effd7cf.zip#RFXtrx==0.15']
+
+DOMAIN = "rfxtrx"
+CONF_DEVICE = 'device'
+RECEIVED_EVT_SUBSCRIBERS = []
+RFX_DEVICES = {}
+
+def setup(hass, config):
+    """ Setup the Rfxtrx component. """
+
+    # Init logger
+    logger = logging.getLogger(__name__)
+
+    # Declare the Handle event
+    def handle_receive(event):
+        """ Callback all subscribers for RFXtrx gateway. """
+        for subscriber in RECEIVED_EVT_SUBSCRIBERS:
+            subscriber(event)
+
+    # Try to load the RFXtrx module
+    try:
+        import RFXtrx as rfxtrxmod
+    except ImportError:
+        logger.exception("Failed to import rfxtrx")
+        return False
+
+    # Init the rfxtrx module
+    device = config[DOMAIN][CONF_DEVICE]
+    rfxtrxmod.Core(device, handle_receive)
+
+    return True

homeassistant/components/sensor/rfxtrx.py

@@ -24,6 +24,9 @@ from collections import OrderedDict
 
 from homeassistant.const import (TEMP_CELCIUS)
 from homeassistant.helpers.entity import Entity
+import homeassistant.components.rfxtrx as rfxtrx
+from RFXtrx import SensorEvent
+from homeassistant.util import slugify
 
 REQUIREMENTS = ['https://github.com/Danielhiversen/pyRFXtrx/archive/' +
                 'ec7a1aaddf8270db6e5da1c13d58c1547effd7cf.zip#RFXtrx==0.15']
@@ -36,7 +39,7 @@ DATA_TYPES = OrderedDict([
     ('Rain rate', '')])
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
     """ Setup the RFXtrx platform. """
     logger = logging.getLogger(__name__)
 
@@ -44,23 +47,19 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
 
     def sensor_update(event):
         """ Callback for sensor updates from the RFXtrx gateway. """
-        if event.device.id_string in sensors:
-            sensors[event.device.id_string].event = event
+        if isinstance(event.device, SensorEvent):
+            entity_id = '%s-%s' % (event.device.type_string.lower(), slugify(event.device.id_string.lower()))
+            if entity_id in rfxtrx.RFX_DEVICES:
+                rfxtrx.RFX_DEVICES[entity_id].event = event
             else:
-            logger.info("adding new sensor: %s", event.device.type_string)
-            new_sensor = RfxtrxSensor(event)
-            sensors[event.device.id_string] = new_sensor
-            add_devices([new_sensor])
-    try:
-        import RFXtrx as rfxtrx
-    except ImportError:
-        logger.exception(
-            "Failed to import rfxtrx")
-        return False
-
-    device = config.get("device", "")
-    rfxtrx.Core(device, sensor_update)
+                automatic_add = config.get('automatic_add', False)
+                if automatic_add:
+                    new_light = RfxtrxSensor(entity_id, False)
+                    rfxtrx.RFX_DEVICES[entity_id] = new_light
+                    add_devices_callback([new_light])
 
+    if sensor_update not in rfxtrx.RECEIVED_EVT_SUBSCRIBERS:
+        rfxtrx.RECEIVED_EVT_SUBSCRIBERS.append(sensor_update)
 
 class RfxtrxSensor(Entity):
     """ Represents a RFXtrx sensor. """

homeassistant/components/switch/rfxtrx.py

@@ -0,0 +1,102 @@
+"""
+homeassistant.components.switch.rfxtrx
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Support for Rfxtrx switch.
+
+Configuration:
+
+To use Rfxtrx switchs you will need to add the following to your
+configuration.yaml file.
+
+switch:
+  platform: rfxtrx
+
+  devices:
+    ac09c4f1: Bedroom Door
+    ac09c4f2: Kitchen Door
+    ac09c4f3: Bathroom Door
+
+*Optional*
+
+  # Automatic add new switch
+  automatic_add: True
+
+"""
+import logging
+import homeassistant.components.rfxtrx as rfxtrx
+from RFXtrx import LightingDevice
+
+from homeassistant.components.switch import SwitchDevice
+from homeassistant.util import slugify
+
+REQUIREMENTS = ['https://github.com/Danielhiversen/pyRFXtrx/archive/' +
+                'ec7a1aaddf8270db6e5da1c13d58c1547effd7cf.zip#RFXtrx==0.15']
+
+DOMAIN = "rfxtrx"
+
+def setup_platform(hass, config, add_devices_callback, discovery_info=None):
+    """ Setup the RFXtrx platform. """
+    # Add switch from config file
+    devices = config.get('devices')
+    for entity_id, entity_name in devices.items():
+        if entity_id not in rfxtrx.RFX_DEVICES:
+            new_switch = RfxtrxSwitch(entity_name, False)
+            rfxtrx.RFX_DEVICES[entity_id] = new_switch
+
+    add_devices_callback(rfxtrx.RFX_DEVICES.values())
+
+    def switch_update(event):
+        """ Callback for sensor updates from the RFXtrx gateway. """
+        if isinstance(event.device, LightingDevice):
+            entity_id = '%s-%s' % (event.device.type_string.lower(), slugify(event.device.id_string.lower()))
+
+            # Add entity if not exist and the automatic_add is True
+            if entity_id not in rfxtrx.RFX_DEVICES:
+                automatic_add = config.get('automatic_add', False)
+                if automatic_add:
+                    new_switch = RfxtrxSwitch(entity_id, False)
+                    rfxtrx.RFX_DEVICES[entity_id] = new_switch
+                    add_devices_callback([new_switch])
+
+            # Check if entity exists (previous automatic added)
+            if entity_id in rfxtrx.RFX_DEVICES:
+                if event.values['Command'] == 'On' or event.values['Command'] == 'Off':
+                    if event.values['Command'] == 'On':
+                        rfxtrx.RFX_DEVICES[entity_id].turn_on()
+                    else:
+                        rfxtrx.RFX_DEVICES[entity_id].turn_off()
+
+    if switch_update not in rfxtrx.RECEIVED_EVT_SUBSCRIBERS:
+        rfxtrx.RECEIVED_EVT_SUBSCRIBERS.append(switch_update)
+
+
+class RfxtrxSwitch(SwitchDevice):
+    """ Provides a demo switch. """
+    def __init__(self, name, state):
+        self._name = name
+        self._state = state
+
+    @property
+    def should_poll(self):
+        """ No polling needed for a demo switch. """
+        return False
+
+    @property
+    def name(self):
+        """ Returns the name of the device if any. """
+        return self._name
+
+    @property
+    def is_on(self):
+        """ True if device is on. """
+        return self._state
+
+    def turn_on(self, **kwargs):
+        """ Turn the device on. """
+        self._state = True
+        self.update_ha_state()
+
+    def turn_off(self, **kwargs):
+        """ Turn the device off. """
+        self._state = False
+        self.update_ha_state()