Merge pull request #39 from plugwise/devicenames2

Merge heater_central into gateway

Author: CoMPaTech

custom_components/plugwise-beta/binary_sensor.py

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

custom_components/plugwise-beta/sensor.py

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

custom_components/plugwise-beta/water_heater.py

@@ -72,8 +72,16 @@ def __init__(self, api, updater, name, dev_id):
         self._domestic_hot_water_state = False
         self._central_heater_water_pressure = None
 
+        whname = binary_sensor.replace("_", " ").title()
+        self._whname = f"{name} {whname}"
         if self._dev_id == self._api.heater_id:
-            self._name = f"Auxiliary"
+            self._whname = f"Auxiliary {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
+            self._name = f"Smile {self._name}"
+            self._via_id = None
 
         self._unique_id = f"wh-{dev_id}-{self._name}"
 
@@ -99,7 +107,7 @@ def _update_callback(self):
     @property
     def name(self):
         """Return the name of the thermostat, if any."""
-        return self._name
+        return self._whname
 
     @property
     def device_info(self) -> Dict[str, any]: