Merge pull request #143 from plugwise/add_binary_sensors

Add cooling_state and heating_state to binary_sensors-dict

Author: bouwew

plugwise/constants.py

@@ -546,14 +546,18 @@
 SWITCH_ICON = "mdi:electric-switch"
 
 # Binary Sensors
+COOLING_STATE = {"cooling_state": False}
 DHW_STATE = {"dhw_state": False}
 FLAME_STATE = {"flame_state": False}
+HEATING_STATE = {"heating_state": False}
 PW_NOTIFICATION = {"plugwise_notification": False}
 SLAVE_BOILER_STATE = {"slave_boiler_state": False}
 
 BINARY_SENSORS = [
+    COOLING_STATE,
     DHW_STATE,
     FLAME_STATE,
+    HEATING_STATE,
     SLAVE_BOILER_STATE,
 ]
 

tests/test_smile.py

@@ -610,9 +610,8 @@ async def test_connect_legacy_anna(self):
                 "model": "4.21",
                 "name": "OpenTherm",
                 "vendor": "Bosch Thermotechniek B.V.",
-                "heating_state": True,
                 "cooling_active": False,
-                "binary_sensors": {"flame_state": True},
+                "binary_sensors": {"flame_state": True, "heating_state": True},
                 "sensors": {
                     "water_temperature": 23.6,
                     "intended_boiler_temperature": 17.0,
@@ -715,9 +714,8 @@ async def test_connect_legacy_anna_2(self):
                 "model": "Generic heater",
                 "name": "OpenTherm",
                 "vendor": None,
-                "heating_state": False,
                 "cooling_active": False,
-                "binary_sensors": {"flame_state": False},
+                "binary_sensors": {"flame_state": False, "heating_state": False},
                 "sensors": {
                     "water_temperature": 54.0,
                     "intended_boiler_temperature": 0.0,
@@ -907,9 +905,12 @@ async def test_connect_anna_v4(self):
                 "model": "2.32",
                 "name": "OpenTherm",
                 "vendor": "Bosch Thermotechniek B.V.",
-                "heating_state": True,
                 "cooling_active": False,
-                "binary_sensors": {"dhw_state": False, "flame_state": True},
+                "binary_sensors": {
+                    "dhw_state": False,
+                    "flame_state": True,
+                    "heating_state": True,
+                },
                 "sensors": {
                     "water_temperature": 52.0,
                     "intended_boiler_temperature": 48.6,
@@ -1127,8 +1128,8 @@ async def test_connect_anna_without_boiler_fw42(self):
                 "model": "Unknown",
                 "name": "OnOff",
                 "vendor": None,
-                "heating_state": True,
                 "cooling_active": False,
+                "binary_sensors": {"heating_state": True},
             },
             # Anna
             "7ffbb3ab4b6c4ab2915d7510f7bf8fe9": {
@@ -1220,8 +1221,7 @@ async def test_connect_adam_plus_anna(self):
             },
             # Central
             "2743216f626f43948deec1f7ab3b3d70": {
-                "binary_sensors": {"flame_state": False},
-                "heating_state": False,
+                "binary_sensors": {"flame_state": False, "heating_state": False},
             },
             # Plug MediaCenter
             "aa6b0002df0a46e1b1eb94beb61eddfe": {
@@ -1413,10 +1413,13 @@ async def test_connect_adam_plus_anna_new(self):
                 "model": "Generic heater",
                 "name": "OpenTherm",
                 "vendor": None,
-                "heating_state": True,
-                "cooling_state": False,
                 "cooling_active": False,
-                "binary_sensors": {"dhw_state": False, "flame_state": False},
+                "binary_sensors": {
+                    "cooling_state": False,
+                    "dhw_state": False,
+                    "flame_state": False,
+                    "heating_state": True,
+                },
                 "sensors": {
                     "water_temperature": 37.0,
                     "intended_boiler_temperature": 38.1,
@@ -1483,8 +1486,7 @@ async def test_connect_adam_plus_anna_new_copy_dhw_and_heating(self):
         testdata = {
             # Central
             "2743216f626f43948deec1f7ab3b3d70": {
-                "binary_sensors": {"dhw_state": True},
-                "heating_state": True,
+                "binary_sensors": {"dhw_state": True, "heating_state": True},
             },
             # Lisa Badkamer
             "453e510de7cb47af8ec5b44fbf40cbe5": {
@@ -1506,7 +1508,7 @@ async def test_connect_adam_plus_anna_new_copy_cooling(self):
         testdata = {
             # Central
             "2743216f626f43948deec1f7ab3b3d70": {
-                "cooling_state": True,
+                "binary_sensors": {"cooling_state": True},
             },
         }
 
@@ -1524,8 +1526,7 @@ async def test_connect_adam_plus_anna_new_copy_dhw_and_cooling(self):
         testdata = {
             # Central
             "2743216f626f43948deec1f7ab3b3d70": {
-                "binary_sensors": {"dhw_state": True},
-                "cooling_state": True,
+                "binary_sensors": {"cooling_state": True, "dhw_state": True},
             }
         }
 
@@ -1542,7 +1543,7 @@ async def test_connect_adam_zone_per_device(self):
         """Test a broad setup of Adam with a zone per device setup."""
         testdata = {
             "90986d591dcd426cae3ec3e8111ff730": {
-                "heating_state": False,
+                "binary_sensors": {"heating_state": False},
             },
             # Lisa WK
             "b59bcebaf94b499ea7d46e4a66fb62d8": {
@@ -1801,7 +1802,7 @@ async def test_connect_adam_multiple_devices_per_zone(self):
                 "name": "OnOff",
                 "vendor": None,
                 "cooling_active": False,
-                "heating_state": True,
+                "binary_sensors": {"heating_state": True},
                 "sensors": {
                     "water_temperature": 70.0,
                     "intended_boiler_temperature": 70.0,
@@ -2223,9 +2224,11 @@ async def test_connect_anna_heatpump(self):
             # Heater central
             "1cbf783bb11e4a7c8a6843dee3a86927": {
                 "cooling_active": False,
-                "cooling_state": False,
-                "heating_state": True,
-                "binary_sensors": {"dhw_state": False},
+                "binary_sensors": {
+                    "cooling_state": False,
+                    "dhw_state": False,
+                    "heating_state": True,
+                },
                 "sensors": {
                     "outdoor_temperature": 3.0,
                     "water_temperature": 29.1,
@@ -2279,9 +2282,11 @@ async def test_connect_anna_heatpump_cooling(self):
             # Heater central
             "1cbf783bb11e4a7c8a6843dee3a86927": {
                 "cooling_active": True,
-                "cooling_state": True,
-                "heating_state": False,
-                "binary_sensors": {"dhw_state": False},
+                "binary_sensors": {
+                    "cooling_state": True,
+                    "dhw_state": False,
+                    "heating_state": False,
+                },
                 "sensors": {
                     "outdoor_temperature": 22.0,
                     "water_temperature": 24.7,
@@ -2323,7 +2328,7 @@ async def test_connect_adam_plus_anna_copy_with_error_domain_added(self):
         testdata = {
             # Central
             "2743216f626f43948deec1f7ab3b3d70": {
-                "heating_state": False,
+                "binary_sensors": {"heating_state": False},
             },
         }