Merge pull request #41 from plugwise/devicenames2

Devicenames2

Author: bouwew

custom_components/plugwise-beta/binary_sensor.py

@@ -75,14 +75,14 @@ def __init__(self, api, updater, name, binary_sensor, dev_id, model):
         self._binary_sensor = binary_sensor
         self._is_on = False
 
-        bsensorname = binary_sensor.replace("_", " ").title()
-        self._sensorname = f"{name} {bsensorname}"
         if self._dev_id == self._api.heater_id:
-            self._sensorname = f"Auxiliary {bsensorname}"
+            self._name = f"Auxiliary"
+
+        bsensorname = binary_sensor.replace("_", " ").title()
+        self._sensorname = f"{self._name} {bsensorname}"
 
         self._via_id = self._api.gateway_id
-        if self._dev_id in [self._api.gateway_id, self._api.heater_id]:
-            self._dev_id = self._api.gateway_id
+        if self._dev_id == self._api.gateway_id:
             self._name = f"Smile {self._name}"
             self._via_id = None
 

custom_components/plugwise-beta/sensor.py

@@ -209,14 +209,13 @@ def __init__(self, api, updater, name, dev_id, sensor, sensor_type):
         self._class = sensor_type[2]
         self._state = None
 
-        sensorname = sensor.replace("_", " ").title()
-        self._sensorname = f"{name} {sensorname}"
         if self._dev_id == self._api.heater_id:
-            self._sensorname = f"Auxiliary {sensorname}"
+            self._name = f"Auxiliary"
+        sensorname = sensor.replace("_", " ").title()
+        self._sensorname = f"{self._name} {sensorname}"
 
         self._via_id = self._api.gateway_id
-        if self._dev_id in [self._api.gateway_id, self._api.heater_id]:
-            self._dev_id = self._api.gateway_id
+        if self._dev_id == self._api.gateway_id:
             self._name = f"Smile {self._name}"
             self._via_id = None
 

custom_components/plugwise-beta/water_heater.py

@@ -77,8 +77,7 @@ def __init__(self, api, updater, name, dev_id):
             self._whname = f"Auxiliary {self._whname}"
 
         self._via_id = self._api.gateway_id
-        if self._dev_id in [self._api.gateway_id, self._api.heater_id]:
-            self._dev_id = self._api.gateway_id
+        if self._dev_id == self._api.gateway_id:
             self._name = f"Smile {self._name}"
             self._via_id = None