Simple PLATFORM names, better unique_ids

Author: bouwew

custom_components/plugwise-beta/__init__.py

@@ -19,8 +19,8 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-SENSORS = ["sensor"]
-CLIMATE = ["binary_sensor", "climate", "sensor", "switch"]
+SENSOR = ["sensor"]
+SINGLE = ["binary_sensor", "climate", "sensor", "switch"]
 MULTI = ["binary_sensor", "climate", "sensor", "switch", "water_heater"]
 
 async def async_setup(hass: HomeAssistant, config: dict):
@@ -70,11 +70,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     _LOGGER.debug("Single master thermostat = %s", single_master_thermostat)
     if single_master_thermostat is not None:
         if single_master_thermostat == True:
-            PLATFORMS = CLIMATE
+            PLATFORMS = SINGLE
         else:
             PLATFORMS = MULTI
     else:
-        PLATFORMS = SENSORS
+        PLATFORMS = SENSOR
 
     for component in PLATFORMS:
         hass.async_create_task(

custom_components/plugwise-beta/binary_sensor.py

@@ -72,7 +72,7 @@ def __init__(self, api, updater, name, binary_sensor, dev_id):
         self._name = name
         self._binary_sensor = binary_sensor
         self._is_on = False
-        self._unique_id = f"{dev_id}-{name}"
+        self._unique_id = f"bs-{dev_id}-{name}"
 
     @property
     def unique_id(self):

custom_components/plugwise-beta/climate.py

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

custom_components/plugwise-beta/sensor.py

@@ -204,7 +204,7 @@ 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"{dev_id}-{name}-{sensor_type[2]}"
+        self._unique_id = f"sr-{dev_id}-{name}"
         _LOGGER.debug("Registering Plugwise %s", self._unique_id)
 
     @property

custom_components/plugwise-beta/switch.py

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

custom_components/plugwise-beta/water_heater.py

@@ -67,7 +67,7 @@ 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"{dev_id}-water_heater"
+        self._unique_id = f"wh-{dev_id}-{name}"
 
     @property
     def unique_id(self):