Merge pull request #32 from plugwise/single_master_thermostat

Single/Multi-thermostats and other changes

Author: bouwew

custom_components/plugwise-beta/__init__.py

@@ -19,8 +19,9 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-PLATFORMS = ["binary_sensor", "climate", "sensor", "switch", "water_heater"]
-
+SENSOR = ["sensor"]
+SINGLE = ["binary_sensor", "climate", "sensor", "switch"]
+MULTI = ["binary_sensor", "climate", "sensor", "switch", "water_heater"]
 
 async def async_setup(hass: HomeAssistant, config: dict):
     """Set up the Plugwise platform."""
@@ -65,6 +66,16 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     )
     _LOGGER.debug("Plugwise device registry  %s", result)
 
+    single_master_thermostat = api.single_master_thermostat()
+    _LOGGER.debug("Single master thermostat = %s", single_master_thermostat)
+    if single_master_thermostat is not None:
+        if single_master_thermostat == True:
+            PLATFORMS = SINGLE
+        else:
+            PLATFORMS = MULTI
+    else:
+        PLATFORMS = SENSOR
+
     for component in PLATFORMS:
         hass.async_create_task(
             hass.config_entries.async_forward_entry_setup(entry, component)

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

@@ -5,6 +5,7 @@
 
 from homeassistant.components.climate import ClimateDevice
 from homeassistant.components.climate.const import (
+    CURRENT_HVAC_COOL,
     CURRENT_HVAC_HEAT,
     CURRENT_HVAC_IDLE,
     HVAC_MODE_AUTO,
@@ -100,7 +101,8 @@ def __init__(self, api, updater, name, dev_id, loc_id, min_temp, max_temp):
         self._water_pressure = None
         self._schedule_temp = None
         self._hvac_mode = None
-        self._unique_id = f"{dev_id}-climate"
+        self._single_thermostat = self._api.single_master_thermostat()
+        self._unique_id = f"cl-{dev_id}-{name}"
 
     @property
     def unique_id(self):
@@ -124,12 +126,20 @@ def _update_callback(self):
     @property
     def hvac_action(self):
         """Return the current action."""
-        if (
-            self._central_heating_state is not None or self._boiler_state is not None
-        ) and self._cooling_state is None:
-            if self._thermostat > self._temperature:
+        if self._single_thermostat:
+            if self._central_heating_state or self._boiler_state:
                 return CURRENT_HVAC_HEAT
-        return CURRENT_HVAC_IDLE
+            if self._cooling_state:
+                return CURRENT_HVAC_COOL
+            return CURRENT_HVAC_IDLE
+        else:
+            if (
+                self._central_heating_state is not None 
+                or self._boiler_state is not None
+            ):
+                if self._thermostat > self._temperature:
+                    return CURRENT_HVAC_HEAT
+            return CURRENT_HVAC_IDLE
 
     @property
     def name(self):
@@ -183,7 +193,10 @@ def preset_modes(self):
     @property
     def hvac_modes(self):
         """Return the available hvac modes list."""
-        if self._central_heating_state is not None or self._boiler_state is not None:
+        if (
+            self._central_heating_state is not None 
+            or self._boiler_state is not None
+        ):
             if self._cooling_state is not None:
                 return HVAC_MODES_2
             return HVAC_MODES_1
@@ -306,15 +319,14 @@ def update(self):
                 if heater_central_data["cooling_state"] is not None:
                     self._cooling_state = heater_central_data["cooling_state"]
 
-            if self._schema_status:
-                self._hvac_mode = HVAC_MODE_AUTO
-            elif (
-                self._central_heating_state is not None
-                or self._boiler_state is not None
-                or self._domestic_hot_water_state is not None
-            ):
-                if self._cooling_state is not None:
-                    self._hvac_mode = HVAC_MODE_HEAT_COOL
-                self._hvac_mode = HVAC_MODE_HEAT
-            else:
-                self._hvac_mode = HVAC_MODE_OFF
+        if self._schema_status:
+            self._hvac_mode = HVAC_MODE_AUTO
+        elif self._central_heating_state is not None or self._boiler_state is not None:
+            if self._cooling_state is not None:
+                self._hvac_mode = HVAC_MODE_HEAT_COOL
+            self._hvac_mode = HVAC_MODE_HEAT
+        elif self._cooling_state is not None:
+            if self._central_heating_state is not None or self._boiler_state is not None:
+                self._hvac_mode = HVAC_MODE_HEAT_COOL
+
+

custom_components/plugwise-beta/manifest.json

@@ -2,7 +2,7 @@
   "domain": "plugwise-beta",
   "name": "Plugwise Beta for Home Assistant",
   "documentation": "https://github.com/plugwise/plugwise-beta",
-  "requirements": ["Plugwise_Smile==0.1.18"],
+  "requirements": ["Plugwise_Smile==0.1.21"],
   "dependencies": [],
   "codeowners": ["@CoMPaTech","@bouwew"],
   "config_flow": true

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):