Merge pull request #4 from plugwise/demand

Demand

Author: CoMPaTech

custom_components/plugwise-beta/__init__.py

@@ -4,16 +4,8 @@
 import logging
 from datetime import timedelta
 from typing import Optional
-
 import voluptuous as vol
 
-from homeassistant.components.climate.const import (
-    HVAC_MODE_AUTO,
-    HVAC_MODE_HEAT,
-    HVAC_MODE_HEAT_COOL,
-    SUPPORT_PRESET_MODE,
-    SUPPORT_TARGET_TEMPERATURE,
-)
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import device_registry as dr
@@ -25,12 +17,6 @@
 
 CONFIG_SCHEMA = vol.Schema({DOMAIN: vol.Schema({})}, extra=vol.ALLOW_EXTRA)
 
-# HVAC modes
-HVAC_MODES_1 = [HVAC_MODE_HEAT, HVAC_MODE_AUTO]
-HVAC_MODES_2 = [HVAC_MODE_HEAT_COOL, HVAC_MODE_AUTO]
-
-SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE | SUPPORT_PRESET_MODE
-
 _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS = ["climate", "sensor", "switch", "water_heater"]
@@ -40,7 +26,6 @@ async def async_setup(hass: HomeAssistant, config: dict):
     """Set up the Plugwise platform."""
     return True
 
-
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Plugwise Smiles from a config entry."""
 
@@ -80,7 +65,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     )
     _LOGGER.debug("Plugwise device registry  %s", result)
 
-    for component in PLATFORMS:  # api._platforms
+    for component in PLATFORMS:
         hass.async_create_task(
             hass.config_entries.async_forward_entry_setup(entry, component)
         )
@@ -94,7 +79,6 @@ async def async_refresh_all(_):
 
     return True
 
-
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry):
     """Unload a config entry."""
     unload_ok = all(

custom_components/plugwise-beta/climate.py

@@ -1,7 +1,6 @@
 """Plugwise Climate component for Home Assistant."""
 
 import logging
-from datetime import timedelta
 from typing import Dict
 
 from homeassistant.components.climate import ClimateDevice
@@ -19,15 +18,21 @@
 from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS
 from homeassistant.core import callback
 
-from . import HVAC_MODES_1, HVAC_MODES_2
-from .const import DOMAIN, THERMOSTAT_ICON
+from .const import (
+    DOMAIN, 
+    THERMOSTAT_ICON,
+    DEFAULT_MIN_TEMP, 
+    DEFAULT_MAX_TEMP,
+)
+
+# HVAC modes
+HVAC_MODES_1 = [HVAC_MODE_HEAT, HVAC_MODE_AUTO]
+HVAC_MODES_2 = [HVAC_MODE_HEAT_COOL, HVAC_MODE_AUTO]
 
 SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE | SUPPORT_PRESET_MODE
 
 _LOGGER = logging.getLogger(__name__)
 
-SCAN_INTERVAL = timedelta(seconds=30)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the Smile Thermostats from a config entry."""
@@ -43,7 +48,12 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
 
         _LOGGER.debug("Plugwise climate Dev %s", device["name"])
         thermostat = PwThermostat(
-            api, updater, device["name"], dev_id, device["location"], 4, 30
+            api, 
+            updater, 
+            device["name"], 
+            dev_id, device["location"], 
+            DEFAULT_MIN_TEMP, 
+            DEFAULT_MAX_TEMP,
         )
 
         if not thermostat:
@@ -82,7 +92,6 @@ def __init__(self, api, updater, name, dev_id, loc_id, min_temp, max_temp):
         self._schema_status = None
         self._temperature = None
         self._thermostat = None
-        self._boiler_temp = None
         self._water_pressure = None
         self._schedule_temp = None
         self._hvac_mode = None
@@ -106,20 +115,23 @@ def _update_callback(self):
         """Call update method."""
         self.update()
         self.async_write_ha_state()
-        # self.async_schedule_update_ha_state(True)
 
     @property
     def hvac_action(self):
         """Return the current action."""
-        if (
-            self._central_heating_state
-            or self._boiler_status
-            or self._domestic_hot_water_state
-        ):
-            return CURRENT_HVAC_HEAT
-        if self._cooling_status:
-            return CURRENT_HVAC_COOL
+        if (self._central_heating_state is not None or self._boiler_status is not None) and self._cooling_status is None:
+            if self._thermostat > self._temperature:
+                return CURRENT_HVAC_HEAT
         return CURRENT_HVAC_IDLE
+        #if (
+        #    self._central_heating_state
+        #    or self._boiler_status
+        #    or self._domestic_hot_water_state
+        #):
+        #    return CURRENT_HVAC_HEAT
+        #if self._cooling_status:
+        #    return CURRENT_HVAC_COOL
+        #return CURRENT_HVAC_IDLE
 
     @property
     def name(self):
@@ -280,8 +292,6 @@ def update(self):
             _LOGGER.error("Received no heater_central_data for device %s.", self._name)
         else:
             _LOGGER.debug("Heater_central_data collected from Plugwise API")
-            if "boiler_temp" in heater_central_data:
-                self._boiler_temp = heater_central_data["boiler_temp"]
             if "boiler_state" in heater_central_data:
                 if heater_central_data["boiler_state"] is not None:
                     self._boiler_status = heater_central_data["boiler_state"] == "on"
@@ -293,11 +303,6 @@ def update(self):
             if "cooling_state" in heater_central_data:
                 if heater_central_data["cooling_state"] is not None:
                     self._cooling_status = heater_central_data["cooling_state"] == "on"
-            if "domestic_hot_water_state" in heater_central_data:
-                if heater_central_data["domestic_hot_water_state"] is not None:
-                    self._domestic_hot_water_state = (
-                        heater_central_data["domestic_hot_water_state"] == "on"
-                    )
 
             if self._schema_status:
                 self._hvac_mode = HVAC_MODE_AUTO

custom_components/plugwise-beta/const.py

@@ -24,11 +24,14 @@
 CONF_GAS = "gas"
 
 ATTR_ILLUMINANCE = "illuminance"
+CURRENT_HVAC_DHW = "hot_water"
 
 # Icons
 SWITCH_ICON = "mdi:electric-switch"
 THERMOSTAT_ICON = "mdi:thermometer"
 WATER_HEATER_ICON = "mdi:water-pump"
+FLAME_ICON = "mdi:fire"
+IDLE_ICON = "mdi:close-circle-outline"
 GAS_ICON = "mdi:fire"
 POWER_ICON = "mdi:flash"
 POWER_FAILURE_ICON = "mdi:flash-off"

custom_components/plugwise-beta/manifest.json

@@ -2,7 +2,7 @@
   "domain": "plugwise-beta",
   "name": "Plugwise Beta for Home Assistant",
   "documentation": "",
-  "requirements": ["Plugwise_Smile==0.0.40"],
+  "requirements": ["Plugwise_Smile==0.0.42"],
   "dependencies": [],
   "codeowners": ["@CoMPaTech","@bouwew"],
   "config_flow": true

custom_components/plugwise-beta/sensor.py

@@ -1,7 +1,6 @@
 """Plugwise Sensor component for Home Assistant."""
 
 import logging
-from datetime import timedelta
 from typing import Dict
 
 from homeassistant.const import (
@@ -18,9 +17,6 @@
 
 from .const import DEVICE_CLASS_GAS, DOMAIN
 
-DEFAULT_NAME = "Plugwise async sensor"
-DEFAULT_ICON = "mdi:thermometer"
-
 _LOGGER = logging.getLogger(__name__)
 
 ATTR_TEMPERATURE = [
@@ -68,7 +64,6 @@
         "mdi:flash",
     ],
     "outdoor_temperature": ATTR_TEMPERATURE,
-    "central_heater_water_pressure": ATTR_PRESSURE,
     "illuminance": ATTR_ILLUMINANCE,
     "boiler_temperature": ATTR_TEMPERATURE,
     "electricity_consumed_off_peak_point": [
@@ -145,28 +140,6 @@
     ],
 }
 
-# TODO:
-#    'relay',
-#    'valve_position',
-#    'boiler_state',
-#    'central_heating_state',
-#    'cooling_state',
-#    'dhw_state',
-
-# TODO:
-#    'electricity_consumption_tariff_structure',
-#    'electricity_consumption_peak_tariff',
-#    'electricity_consumption_off_peak_tariff',
-#    'electricity_production_peak_tariff',
-#    'electricity_production_off_peak_tariff',
-#    'electricity_consumption_single_tariff',
-#    'electricity_production_single_tariff',
-#    'gas_consumption_tariff',
-
-# Scan interval for updating sensor values
-# Smile communication is set using configuration directives
-SCAN_INTERVAL = timedelta(seconds=30)
-
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the Smile sensors from a config entry."""
@@ -186,8 +159,6 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
         for sensor, sensor_type in SENSOR_MAP.items():
             if sensor in data:
                 if data[sensor] is not None:
-                    # _LOGGER.info('Plugwise sensor is %s for %s (%s)',sensor,dev_id,device)
-                    # _LOGGER.info('Plugwise sensor data %s for %s',data,dev_id)
                     if "power" in device["types"]:
                         if (
                             "off" in sensor
@@ -396,7 +367,6 @@ def update(self):
             if self._sensor in data:
                 if data[self._sensor] is not None:
                     measurement = data[self._sensor]
-                    # _LOGGER.debug("Sensor value: %s", measurement)
                     if self._unit_of_measurement == "kWh":
                         measurement = int(measurement / 1000)
                     self._state = measurement

custom_components/plugwise-beta/water_heater.py

@@ -3,11 +3,22 @@
 import logging
 from typing import Dict
 
-from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import callback
 from homeassistant.helpers.entity import Entity
 
-from .const import DOMAIN, WATER_HEATER_ICON
+from homeassistant.components.climate.const import (
+    CURRENT_HVAC_COOL,
+    CURRENT_HVAC_HEAT,
+    CURRENT_HVAC_IDLE,
+)
+
+from .const import (
+    CURRENT_HVAC_DHW, 
+    DOMAIN, 
+    FLAME_ICON,
+    IDLE_ICON,
+    WATER_HEATER_ICON,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -22,12 +33,11 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     for dev_id, device in all_devices.items():
         if device["class"] == "heater_central":
             data = api.get_device_data(dev_id)
-            if "domestic_hot_water_state" in data:
-                if data["domestic_hot_water_state"] is not None:
-                    _LOGGER.debug("Plugwise water_heater Dev %s", device["name"])
-                    water_heater = PwWaterHeater(api, updater, device["name"], dev_id)
-                    devices.append(water_heater)
-                    _LOGGER.info("Added water_heater.%s", "{}".format(device["name"]))
+            if "boiler_temperature" in data:
+                _LOGGER.debug("Plugwise water_heater Dev %s", device["name"])
+                water_heater = PwWaterHeater(api, updater, device["name"], dev_id)
+                devices.append(water_heater)
+                _LOGGER.info("Added water_heater.%s", "{}".format(device["name"]))
 
     async_add_entities(devices, True)
 
@@ -41,7 +51,11 @@ def __init__(self, api, updater, name, dev_id):
         self._updater = updater
         self._name = name
         self._dev_id = dev_id
-        self._domestic_hot_water_state = None
+        self._boiler_state = False
+        self._boiler_temp = None
+        self._central_heating_state =  False
+        self._central_heater_water_pressure = None
+        self._domestic_hot_water_state = False
         self._unique_id = f"{dev_id}-water_heater"
 
     @property
@@ -80,15 +94,32 @@ def device_info(self) -> Dict[str, any]:
 
     @property
     def state(self):
-        """Return the state of the sensor."""
-        if self._domestic_hot_water_state:
-            return STATE_ON
-        return STATE_OFF
+        """Return the state of the water_heater."""
+        if self._central_heating_state or self._boiler_state:
+            return CURRENT_HVAC_HEAT
+        elif self._domestic_hot_water_state:
+            return CURRENT_HVAC_DHW
+        else:
+            return CURRENT_HVAC_IDLE
+
+    @property
+    def device_state_attributes(self):
+        """Return the optional device state attributes."""
+        attributes = {}
+        attributes["current_operation"] = self.state
+        attributes["current_temperature"] = self._boiler_temp
+        attributes["water_pressure"] = self._central_heater_water_pressure
+        return attributes
 
     @property
     def icon(self):
         """Return the icon to use in the frontend."""
-        return WATER_HEATER_ICON
+        if self._central_heating_state or self._boiler_state:
+            return FLAME_ICON
+        elif self._domestic_hot_water_state:
+            return WATER_HEATER_ICON
+        else:
+            return IDLE_ICON
 
     @property
     def should_poll(self):
@@ -97,13 +128,24 @@ def should_poll(self):
 
     def update(self):
         """Update the entity."""
-
-        _LOGGER.debug("Update sensor called")
+        _LOGGER.debug("Update water_heater called")
         data = self._api.get_device_data(self._dev_id)
 
         if data is None:
             _LOGGER.error("Received no data for device %s.", self._name)
         else:
+            if "boiler_temperature" in data:
+                self._boiler_temp = data["boiler_temperature"]
+            if "central_heater_water_pressure" in data:
+                self._central_heater_water_pressure = data["central_heater_water_pressure"]
+            if "boiler_state" in data:
+                if data["boiler_state"] is not None:
+                    self._boiler_state = (data["boiler_state"] == "on")
+            if "central_heating_state" in data:
+                if data["central_heating_state"] is not None:
+                    self._central_heating_state = (
+                        data["central_heating_state"] == "on"
+                    )
             if "domestic_hot_water_state" in data:
                 self._domestic_hot_water_state = (
                     data["domestic_hot_water_state"] == "on"