Merge pull request #134 from plugwise/pre_16_3

Implement feedback from Core devs

Author: bouwew

plugwise/__init__.py

@@ -1,6 +1,6 @@
 """Plugwise module."""
 
-__version__ = "0.16.2"
+__version__ = "0.16.3"
 
 from plugwise.smile import Smile
 from plugwise.stick import Stick

plugwise/helper.py

@@ -59,43 +59,6 @@
 }
 
 
-def device_state_updater(data, devs, d_id, d_dict):
-    """Helper-function for async_update().
-    Update the Device_State sensor state.
-    """
-    for item in d_dict["sensors"]:
-        if item == "device_state":
-            result = update_device_state(data, d_dict)
-            devs[d_id]["sensors"][item] = result
-
-
-def update_device_state(data, d_dict):
-    """Helper-function for _device_state_updater()."""
-    _cooling_state = False
-    _dhw_state = False
-    _heating_state = False
-    result = "idle"
-
-    if "binary_sensors" in d_dict:
-        for item, state in d_dict["binary_sensors"].items():
-            if item == "dhw_state" and state:
-                result = "dhw-heating"
-                _dhw_state = True
-
-    if "heating_state" in data and data["heating_state"]:
-        result = "heating"
-        _heating_state = True
-    if _heating_state and _dhw_state:
-        result = "dhw and heating"
-    if "cooling_state" in data and data["cooling_state"]:
-        result = "cooling"
-        _cooling_state = True
-    if _cooling_state and _dhw_state:
-        result = "dhw and cooling"
-
-    return result
-
-
 def pw_notification_updater(devs, d_id, d_dict, notifs):
     """Helper-function for async_update().
     Update the PW_Notification binary_sensor state.
@@ -1168,7 +1131,7 @@ def _schemas(self, location):
                     self._last_active[location] = selected
                 schedules[name] = schedule
             else:
-                _LOGGER.error(
+                _LOGGER.debug(
                     "Schedule %s has no preset switching moments, ignoring.", name
                 )
 

plugwise/smile.py

@@ -16,7 +16,6 @@
     DEFAULT_PORT,
     DEFAULT_TIMEOUT,
     DEFAULT_USERNAME,
-    DEVICE_STATE,
     DOMAIN_OBJECTS,
     LOCATIONS,
     MODULES,
@@ -30,13 +29,7 @@
     THERMOSTAT_CLASSES,
 )
 from .exceptions import ConnectionFailedError, InvalidXMLError, UnsupportedDeviceError
-from .helper import (
-    SmileComm,
-    SmileHelper,
-    device_state_updater,
-    pw_notification_updater,
-    update_helper,
-)
+from .helper import SmileComm, SmileHelper, pw_notification_updater, update_helper
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -46,14 +39,11 @@ class SmileData(SmileHelper):
 
     def _append_special(self, data, d_id, bs_dict, s_dict):
         """Helper-function for smile.py: _all_device_data().
-        When conditions are met, the plugwise_notification binary_sensor
-        and/or the device_state sensor are appended.
+        When conditions are met, the plugwise_notification binary_sensor is appended.
         """
         if d_id == self.gateway_id:
             if self._sm_thermostat is not None:
                 bs_dict.update(PW_NOTIFICATION)
-        if d_id == self._heater_id and self._sm_thermostat is not None:
-            s_dict.update(DEVICE_STATE)
 
     def _all_device_data(self):
         """Helper-function for get_all_devices().
@@ -171,20 +161,16 @@ def _device_data_climate(self, details, device_data):
         else:
             device_data["last_used"] = last_active
 
-        # Operation mode: auto, heat, cool, off
+        # Operation mode: auto, heat, cool
         device_data["mode"] = "auto"
         schedule_status = False
         if sel_schema != "None":
             schedule_status = True
         if not schedule_status:
-            # Mimic HomeKit behavior
-            if self._preset(loc_id) == "away":
-                device_data["mode"] = "off"  # pragma: no cover
-            else:
-                device_data["mode"] = "heat"
-                if self._heater_id is not None:
-                    if self.cooling_active:
-                        device_data["mode"] = "cool"
+            device_data["mode"] = "heat"
+            if self._heater_id is not None:
+                if self.cooling_active:
+                    device_data["mode"] = "cool"
 
         # Control_state
         if ctrl_state := self._control_state(loc_id):
@@ -459,7 +445,6 @@ async def async_update(self):
                     update_helper(
                         data, self.gw_devices, dev_dict, dev_id, "sensors", key
                     )
-                device_state_updater(data, self.gw_devices, dev_id, dev_dict)
             if "switches" in dev_dict:
                 for key, value in list(data.items()):
                     update_helper(
@@ -622,8 +607,6 @@ async def set_switch_state(self, appl_id, members, model, state):
             # Don't bother switching a relay when the corresponding lock-state is true
             if lock_state == "true":
                 return False
-            await self._request(uri, method="put", data=data)
-            return True
 
         await self._request(uri, method="put", data=data)
         return True

tests/test_smile.py

@@ -615,7 +615,6 @@ async def test_connect_legacy_anna(self):
                     "modulation_level": 0.0,
                     "return_temperature": 21.7,
                     "water_pressure": 1.2,
-                    "device_state": "heating",
                 },
             },
             # Gateway
@@ -715,7 +714,6 @@ async def test_connect_legacy_anna_2(self):
                     "modulation_level": 0.0,
                     "return_temperature": 0.0,
                     "water_pressure": 1.7,
-                    "device_state": "idle",
                 },
             },
             # Gateway
@@ -906,7 +904,6 @@ async def test_connect_anna_v4(self):
                     "modulation_level": 0.0,
                     "return_temperature": 42.0,
                     "water_pressure": 2.1,
-                    "device_state": "heating",
                 },
                 "switches": {"dhw_cm_switch": False},
             },
@@ -1116,7 +1113,6 @@ async def test_connect_anna_without_boiler_fw42(self):
                 "vendor": None,
                 "heating_state": True,
                 "cooling_active": False,
-                "sensors": {"device_state": "heating"},
             },
             # Anna
             "7ffbb3ab4b6c4ab2915d7510f7bf8fe9": {
@@ -1395,7 +1391,6 @@ async def test_connect_adam_plus_anna_new(self):
                 "sensors": {
                     "water_temperature": 37.0,
                     "intended_boiler_temperature": 38.1,
-                    "device_state": "heating",
                 },
                 "switches": {"dhw_cm_switch": False},
             },
@@ -1460,7 +1455,6 @@ async def test_connect_adam_plus_anna_new_copy_dhw_and_heating(self):
             "2743216f626f43948deec1f7ab3b3d70": {
                 "binary_sensors": {"dhw_state": True},
                 "heating_state": True,
-                "sensors": {"device_state": "dhw and heating"},
             },
             # Lisa Badkamer
             "453e510de7cb47af8ec5b44fbf40cbe5": {
@@ -1483,7 +1477,6 @@ async def test_connect_adam_plus_anna_new_copy_cooling(self):
             # Central
             "2743216f626f43948deec1f7ab3b3d70": {
                 "cooling_state": True,
-                "sensors": {"device_state": "cooling"},
             },
         }
 
@@ -1503,7 +1496,6 @@ async def test_connect_adam_plus_anna_new_copy_dhw_and_cooling(self):
             "2743216f626f43948deec1f7ab3b3d70": {
                 "binary_sensors": {"dhw_state": True},
                 "cooling_state": True,
-                "sensors": {"device_state": "dhw and cooling"},
             }
         }
 
@@ -1521,7 +1513,6 @@ async def test_connect_adam_zone_per_device(self):
         testdata = {
             "90986d591dcd426cae3ec3e8111ff730": {
                 "heating_state": False,
-                "sensors": {"device_state": "idle"},
             },
             # Lisa WK
             "b59bcebaf94b499ea7d46e4a66fb62d8": {
@@ -1652,7 +1643,7 @@ async def test_connect_adam_multiple_devices_per_zone(self):
                 "selected_schedule": "None",
                 "schedule_temperature": 15.0,
                 "last_used": "Badkamer Schema",
-                "mode": "off",
+                "mode": "heat",
                 "sensors": {"temperature": 16.5, "setpoint": 13.0, "battery": 67},
             },
             "b310b72a0e354bfab43089919b9a88bf": {
@@ -1781,7 +1772,6 @@ async def test_connect_adam_multiple_devices_per_zone(self):
                     "water_temperature": 70.0,
                     "intended_boiler_temperature": 70.0,
                     "modulation_level": 1,
-                    "device_state": "heating",
                 },
             },
             "cd0ddb54ef694e11ac18ed1cbce5dbbd": {