Merge pull request #38 from plugwise/devicenames2

Add Aux to water_heater + ensure name

Author: bouwew

custom_components/plugwise-beta/__init__.py

@@ -62,7 +62,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         config_entry_id=entry.entry_id,
         identifiers={(DOMAIN, api.gateway_id)},
         manufacturer="Plugwise",
-        name="{} - {} Gateway".format(entry.title, api.smile_name),
+        name=entry.title,
         model=f"Smile {api.smile_name}",
         sw_version=api.smile_version[0],
     )

custom_components/plugwise-beta/binary_sensor.py

@@ -74,7 +74,6 @@ def __init__(self, api, updater, name, binary_sensor, dev_id, model):
         self._name = name
         self._binary_sensor = binary_sensor
         self._is_on = False
-        self._unique_id = f"bs-{dev_id}-{name}-{binary_sensor}"
 
         sensorname = binary_sensor.replace("_", " ").title()
         self._sensorname = f"{name} {sensorname}"
@@ -87,6 +86,8 @@ def __init__(self, api, updater, name, binary_sensor, dev_id, model):
             self._name = f"Auxiliary"
             self._sensorname = f"{self._name} {sensorname}"
 
+        self._unique_id = f"bs-{dev_id}-{self._name}-{binary_sensor}"
+
     @property
     def unique_id(self):
         """Return a unique ID."""

custom_components/plugwise-beta/climate.py

@@ -104,7 +104,7 @@ def __init__(self, api, updater, name, dev_id, loc_id, model, min_temp, max_temp
         self._schedule_temp = None
         self._hvac_mode = None
         self._single_thermostat = self._api.single_master_thermostat()
-        self._unique_id = f"cl-{dev_id}-{name}"
+        self._unique_id = f"cl-{dev_id}-{self._name}"
 
     @property
     def unique_id(self):

custom_components/plugwise-beta/sensor.py

@@ -208,7 +208,6 @@ def __init__(self, api, updater, name, dev_id, sensor, sensor_type):
         self._icon = sensor_type[3]
         self._class = sensor_type[2]
         self._state = None
-        self._unique_id = f"cl-{dev_id}-{name}-{sensor}"
 
         sensorname = sensor.replace("_", " ").title()
         self._sensorname = f"{name} {sensorname}"
@@ -221,6 +220,8 @@ def __init__(self, api, updater, name, dev_id, sensor, sensor_type):
             self._name = f"Auxiliary"
             self._sensorname = f"{self._name} {sensorname}"
 
+        self._unique_id = f"cl-{dev_id}-{self._name}-{sensor}"
+
     @property
     def unique_id(self):
         """Return a unique ID."""

custom_components/plugwise-beta/switch.py

@@ -39,7 +39,7 @@ def __init__(self, api, updater, name, dev_id, model):
         self._name = name
         self._dev_id = dev_id
         self._device_is_on = False
-        self._unique_id = f"sw-{dev_id}-{name}"
+        self._unique_id = f"sw-{dev_id}-{self._name}"
 
     @property
     def unique_id(self):

custom_components/plugwise-beta/water_heater.py

@@ -71,7 +71,11 @@ def __init__(self, api, updater, name, dev_id):
         self._cooling_state = False
         self._domestic_hot_water_state = False
         self._central_heater_water_pressure = None
-        self._unique_id = f"wh-{dev_id}-{name}"
+
+        if self._dev_id == self._api.heater_id:
+            self._name = f"Auxiliary"
+
+        self._unique_id = f"wh-{dev_id}-{self._name}"
 
     @property
     def unique_id(self):