fix autodiscovery

home-assistant · Jun 25, 2016 · 86ccf26 · 86ccf26
1 parent 87c138c
commit 86ccf26
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 4 deletions.
diff --git a/homeassistant/components/binary_sensor/homematic.py b/homeassistant/components/binary_sensor/homematic.py
@@ -55,6 +55,8 @@
 
 def setup_platform(hass, config, add_callback_devices, discovery_info=None):
     """Setup the platform."""
+    if discovery_info:
+        config = discovery_info
     return homematic.setup_hmdevice_entity_helper(HMBinarySensor,
                                                   config,
                                                   add_callback_devices)

diff --git a/homeassistant/components/homematic.py b/homeassistant/components/homematic.py
@@ -21,7 +21,6 @@
     ATTR_SERVICE, \
     ATTR_DISCOVERED, \
     STATE_UNKNOWN
-from homeassistant.loader import get_component
 from homeassistant.helpers import discovery
 from homeassistant.helpers.entity import Entity
 import homeassistant.bootstrap
@@ -150,10 +149,8 @@ def system_callback_handler(hass, config, src, *args):
                 # When devices of this type are found
                 # they are setup in HA and an event is fired
                 if found_devices:
-                    component = get_component(component_name)
-
                     # HA discovery event
-                    discovery.load_platform(hass, component, DOMAIN, {
+                    discovery.load_platform(hass, component_name, DOMAIN, {
                         ATTR_DISCOVER_DEVICES: found_devices
                     }, config)
 

diff --git a/homeassistant/components/light/homematic.py b/homeassistant/components/light/homematic.py
@@ -29,6 +29,8 @@
 
 def setup_platform(hass, config, add_callback_devices, discovery_info=None):
     """Setup the platform."""
+    if discovery_info:
+        config = discovery_info
     return homematic.setup_hmdevice_entity_helper(HMLight,
                                                   config,
                                                   add_callback_devices)

diff --git a/homeassistant/components/rollershutter/homematic.py b/homeassistant/components/rollershutter/homematic.py
@@ -29,6 +29,8 @@
 
 def setup_platform(hass, config, add_callback_devices, discovery_info=None):
     """Setup the platform."""
+    if discovery_info:
+        config = discovery_info
     return homematic.setup_hmdevice_entity_helper(HMRollershutter,
                                                   config,
                                                   add_callback_devices)

diff --git a/homeassistant/components/sensor/homematic.py b/homeassistant/components/sensor/homematic.py
@@ -41,6 +41,8 @@
 
 def setup_platform(hass, config, add_callback_devices, discovery_info=None):
     """Setup the platform."""
+    if discovery_info:
+        config = discovery_info
     return homematic.setup_hmdevice_entity_helper(HMSensor,
                                                   config,
                                                   add_callback_devices)

diff --git a/homeassistant/components/switch/homematic.py b/homeassistant/components/switch/homematic.py
@@ -28,6 +28,8 @@
 
 def setup_platform(hass, config, add_callback_devices, discovery_info=None):
     """Setup the platform."""
+    if discovery_info:
+        config = discovery_info
     return homematic.setup_hmdevice_entity_helper(HMSwitch,
                                                   config,
                                                   add_callback_devices)

diff --git a/homeassistant/components/thermostat/homematic.py b/homeassistant/components/thermostat/homematic.py
@@ -28,6 +28,8 @@
 
 def setup_platform(hass, config, add_callback_devices, discovery_info=None):
     """Setup the platform."""
+    if discovery_info:
+        config = discovery_info
     return homematic.setup_hmdevice_entity_helper(HMThermostat,
                                                   config,
                                                   add_callback_devices)