Bump plugwise to v0.34.5 (#105330)

homeassistant/components/plugwise/climate.py

@@ -160,6 +160,16 @@ def hvac_action(self) -> HVACAction:
         # Keep track of the previous action-mode
         self._previous_action_mode(self.coordinator)
 
+        # Adam provides the hvac_action for each thermostat
+        if (control_state := self.device.get("control_state")) == "cooling":
+            return HVACAction.COOLING
+        if control_state == "heating":
+            return HVACAction.HEATING
+        if control_state == "preheating":
+            return HVACAction.PREHEATING
+        if control_state == "off":
+            return HVACAction.IDLE
+
         heater: str = self.coordinator.data.gateway["heater_id"]
         heater_data = self.coordinator.data.devices[heater]
         if heater_data["binary_sensors"]["heating_state"]:

homeassistant/components/plugwise/manifest.json

@@ -7,6 +7,6 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["crcmod", "plugwise"],
-  "requirements": ["plugwise==0.34.3"],
+  "requirements": ["plugwise==0.34.5"],
   "zeroconf": ["_plugwise._tcp.local."]
 }

requirements_all.txt

@@ -1476,7 +1476,7 @@ plexauth==0.0.6
 plexwebsocket==0.0.14
 
 # homeassistant.components.plugwise
-plugwise==0.34.3
+plugwise==0.34.5
 
 # homeassistant.components.plum_lightpad
 plumlightpad==0.0.11

requirements_test_all.txt

@@ -1134,7 +1134,7 @@ plexauth==0.0.6
 plexwebsocket==0.0.14
 
 # homeassistant.components.plugwise
-plugwise==0.34.3
+plugwise==0.34.5
 
 # homeassistant.components.plum_lightpad
 plumlightpad==0.0.11

tests/components/plugwise/fixtures/adam_jip/all_data.json

@@ -4,6 +4,7 @@
       "active_preset": "no_frost",
       "available": true,
       "available_schedules": ["None"],
+      "control_state": "off",
       "dev_class": "zone_thermostat",
       "firmware": "2016-10-27T02:00:00+02:00",
       "hardware": "255",
@@ -99,6 +100,7 @@
       "active_preset": "home",
       "available": true,
       "available_schedules": ["None"],
+      "control_state": "off",
       "dev_class": "zone_thermostat",
       "firmware": "2016-10-27T02:00:00+02:00",
       "hardware": "255",
@@ -155,6 +157,7 @@
       "active_preset": "home",
       "available": true,
       "available_schedules": ["None"],
+      "control_state": "off",
       "dev_class": "zone_thermostat",
       "firmware": "2016-10-27T02:00:00+02:00",
       "hardware": "255",
@@ -265,6 +268,7 @@
       "active_preset": "home",
       "available": true,
       "available_schedules": ["None"],
+      "control_state": "off",
       "dev_class": "zone_thermometer",
       "firmware": "2020-09-01T02:00:00+02:00",
       "hardware": "1",
@@ -300,6 +304,7 @@
     "cooling_present": false,
     "gateway_id": "b5c2386c6f6342669e50fe49dd05b188",
     "heater_id": "e4684553153b44afbef2200885f379dc",
+    "item_count": 219,
     "notifications": {},
     "smile_name": "Adam"
   }

tests/components/plugwise/fixtures/adam_jip/device_list.json

@@ -0,0 +1,13 @@
+[
+  "b5c2386c6f6342669e50fe49dd05b188",
+  "e4684553153b44afbef2200885f379dc",
+  "a6abc6a129ee499c88a4d420cc413b47",
+  "1346fbd8498d4dbcab7e18d51b771f3d",
+  "833de10f269c4deab58fb9df69901b4e",
+  "6f3e9d7084214c21b9dfa46f6eeb8700",
+  "f61f1a2535f54f52ad006a3d18e459ca",
+  "d4496250d0e942cfa7aea3476e9070d5",
+  "356b65335e274d769c338223e7af9c33",
+  "1da4d325838e4ad8aac12177214505c9",
+  "457ce8414de24596a2d5e7dbc9c7682f"
+]

tests/components/plugwise/fixtures/adam_multiple_devices_per_zone/all_data.json

@@ -468,6 +468,7 @@
     "cooling_present": false,
     "gateway_id": "fe799307f1624099878210aa0b9f1475",
     "heater_id": "90986d591dcd426cae3ec3e8111ff730",
+    "item_count": 315,
     "notifications": {
       "af82e4ccf9c548528166d38e560662a4": {
         "warning": "Node Plug (with MAC address 000D6F000D13CB01, in room 'n.a.') has been unreachable since 23:03 2020-01-18. Please check the connection and restart the device."

tests/components/plugwise/fixtures/adam_multiple_devices_per_zone/device_list.json

@@ -0,0 +1,20 @@
+[
+  "fe799307f1624099878210aa0b9f1475",
+  "90986d591dcd426cae3ec3e8111ff730",
+  "df4a4a8169904cdb9c03d61a21f42140",
+  "b310b72a0e354bfab43089919b9a88bf",
+  "a2c3583e0a6349358998b760cea82d2a",
+  "b59bcebaf94b499ea7d46e4a66fb62d8",
+  "d3da73bde12a47d5a6b8f9dad971f2ec",
+  "21f2b542c49845e6bb416884c55778d6",
+  "78d1126fc4c743db81b61c20e88342a7",
+  "cd0ddb54ef694e11ac18ed1cbce5dbbd",
+  "4a810418d5394b3f82727340b91ba740",
+  "02cf28bfec924855854c544690a609ef",
+  "a28f588dc4a049a483fd03a30361ad3a",
+  "6a3bf693d05e48e0b460c815a4fdd09d",
+  "680423ff840043738f42cc7f1ff97a36",
+  "f1fee6043d3642a9b0a65297455f008e",
+  "675416a629f343c495449970e2ca37b5",
+  "e7693eb9582644e5b865dba8d4447cf1"
+]

tests/components/plugwise/fixtures/anna_heatpump_heating/device_list.json

@@ -0,0 +1,5 @@
+[
+  "015ae9ea3f964e668e490fa39da3870b",
+  "1cbf783bb11e4a7c8a6843dee3a86927",
+  "3cb70739631c4d17a86b8b12e8a5161b"
+]

tests/components/plugwise/fixtures/m_adam_cooling/all_data.json

@@ -53,6 +53,7 @@
       "active_preset": "asleep",
       "available": true,
       "available_schedules": ["Weekschema", "Badkamer", "Test"],
+      "control_state": "cooling",
       "dev_class": "thermostat",
       "location": "f2bf9048bef64cc5b6d5110154e33c81",
       "mode": "cool",
@@ -102,6 +103,7 @@
       "active_preset": "home",
       "available": true,
       "available_schedules": ["Weekschema", "Badkamer", "Test"],
+      "control_state": "off",
       "dev_class": "zone_thermostat",
       "firmware": "2016-10-10T02:00:00+02:00",
       "hardware": "255",
@@ -148,6 +150,7 @@
     "cooling_present": true,
     "gateway_id": "da224107914542988a88561b4452b0f6",
     "heater_id": "056ee145a816487eaa69243c3280f8bf",
+    "item_count": 145,
     "notifications": {},
     "smile_name": "Adam"
   }

tests/components/plugwise/fixtures/m_adam_cooling/device_list.json

@@ -0,0 +1,8 @@
+[
+  "da224107914542988a88561b4452b0f6",
+  "056ee145a816487eaa69243c3280f8bf",
+  "ad4838d7d35c4d6ea796ee12ae5aedf8",
+  "1772a4ea304041adb83f357b751341ff",
+  "e2f4322d57924fa090fbbc48b3a140dc",
+  "e8ef2a01ed3b4139a53bf749204fe6b4"
+]

tests/components/plugwise/fixtures/m_adam_heating/all_data.json

@@ -1,5 +1,28 @@
 {
   "devices": {
+    "01234567890abcdefghijklmnopqrstu": {
+      "available": false,
+      "dev_class": "thermo_sensor",
+      "firmware": "2020-11-04T01:00:00+01:00",
+      "hardware": "1",
+      "location": "f871b8c4d63549319221e294e4f88074",
+      "model": "Tom/Floor",
+      "name": "Tom Badkamer",
+      "sensors": {
+        "battery": 99,
+        "temperature": 18.6,
+        "temperature_difference": 2.3,
+        "valve_position": 0.0
+      },
+      "temperature_offset": {
+        "lower_bound": -2.0,
+        "resolution": 0.1,
+        "setpoint": 0.1,
+        "upper_bound": 2.0
+      },
+      "vendor": "Plugwise",
+      "zigbee_mac_address": "ABCD012345670A01"
+    },
     "056ee145a816487eaa69243c3280f8bf": {
       "available": true,
       "binary_sensors": {
@@ -58,6 +81,7 @@
       "active_preset": "asleep",
       "available": true,
       "available_schedules": ["Weekschema", "Badkamer", "Test"],
+      "control_state": "preheating",
       "dev_class": "thermostat",
       "location": "f2bf9048bef64cc5b6d5110154e33c81",
       "mode": "heat",
@@ -101,6 +125,7 @@
       "active_preset": "home",
       "available": true,
       "available_schedules": ["Weekschema", "Badkamer", "Test"],
+      "control_state": "off",
       "dev_class": "zone_thermostat",
       "firmware": "2016-10-10T02:00:00+02:00",
       "hardware": "255",
@@ -147,6 +172,7 @@
     "cooling_present": false,
     "gateway_id": "da224107914542988a88561b4452b0f6",
     "heater_id": "056ee145a816487eaa69243c3280f8bf",
+    "item_count": 145,
     "notifications": {},
     "smile_name": "Adam"
   }

tests/components/plugwise/fixtures/m_adam_heating/device_list.json

@@ -0,0 +1,8 @@
+[
+  "da224107914542988a88561b4452b0f6",
+  "056ee145a816487eaa69243c3280f8bf",
+  "ad4838d7d35c4d6ea796ee12ae5aedf8",
+  "1772a4ea304041adb83f357b751341ff",
+  "e2f4322d57924fa090fbbc48b3a140dc",
+  "e8ef2a01ed3b4139a53bf749204fe6b4"
+]

tests/components/plugwise/fixtures/m_anna_heatpump_cooling/device_list.json

@@ -0,0 +1,5 @@
+[
+  "015ae9ea3f964e668e490fa39da3870b",
+  "1cbf783bb11e4a7c8a6843dee3a86927",
+  "3cb70739631c4d17a86b8b12e8a5161b"
+]

tests/components/plugwise/fixtures/m_anna_heatpump_idle/device_list.json

@@ -0,0 +1,5 @@
+[
+  "015ae9ea3f964e668e490fa39da3870b",
+  "1cbf783bb11e4a7c8a6843dee3a86927",
+  "3cb70739631c4d17a86b8b12e8a5161b"
+]

tests/components/plugwise/fixtures/p1v3_full_option/all_data.json

@@ -42,6 +42,7 @@
   },
   "gateway": {
     "gateway_id": "cd3e822288064775a7c4afcdd70bdda2",
+    "item_count": 31,
     "notifications": {},
     "smile_name": "Smile P1"
   }

tests/components/plugwise/fixtures/p1v3_full_option/device_list.json

@@ -0,0 +1 @@
+["cd3e822288064775a7c4afcdd70bdda2", "e950c7d5e1ee407a858e2a8b5016c8b3"]

tests/components/plugwise/fixtures/p1v4_442_triple/all_data.json

@@ -51,6 +51,7 @@
   },
   "gateway": {
     "gateway_id": "03e65b16e4b247a29ae0d75a78cb492e",
+    "item_count": 40,
     "notifications": {
       "97a04c0c263049b29350a660b4cdd01e": {
         "warning": "The Smile P1 is not connected to a smart meter."

tests/components/plugwise/fixtures/p1v4_442_triple/device_list.json

@@ -0,0 +1 @@
+["03e65b16e4b247a29ae0d75a78cb492e", "b82b6b3322484f2ea4e25e0bd5f3d61f"]

tests/components/plugwise/fixtures/stretch_v31/all_data.json

@@ -135,6 +135,7 @@
   },
   "gateway": {
     "gateway_id": "0000aaaa0000aaaa0000aaaa0000aa00",
+    "item_count": 83,
     "notifications": {},
     "smile_name": "Stretch"
   }

tests/components/plugwise/fixtures/stretch_v31/device_list.json

@@ -0,0 +1,10 @@
+[
+  "0000aaaa0000aaaa0000aaaa0000aa00",
+  "5871317346d045bc9f6b987ef25ee638",
+  "e1c884e7dede431dadee09506ec4f859",
+  "aac7b735042c4832ac9ff33aae4f453b",
+  "cfe95cf3de1948c0b8955125bf754614",
+  "059e4d03c7a34d278add5c7a4a781d19",
+  "d950b314e9d8499f968e6db8d82ef78c",
+  "d03738edfcc947f7b8f4573571d90d2d"
+]

tests/components/plugwise/snapshots/test_diagnostics.ambr

@@ -500,6 +500,7 @@
       'cooling_present': False,
       'gateway_id': 'fe799307f1624099878210aa0b9f1475',
       'heater_id': '90986d591dcd426cae3ec3e8111ff730',
+      'item_count': 315,
       'notifications': dict({
         'af82e4ccf9c548528166d38e560662a4': dict({
           'warning': "Node Plug (with MAC address 000D6F000D13CB01, in room 'n.a.') has been unreachable since 23:03 2020-01-18. Please check the connection and restart the device.",

tests/components/plugwise/test_climate.py

@@ -65,7 +65,7 @@ async def test_adam_2_climate_entity_attributes(
     state = hass.states.get("climate.anna")
     assert state
     assert state.state == HVACMode.HEAT
-    assert state.attributes["hvac_action"] == "heating"
+    assert state.attributes["hvac_action"] == "preheating"
     assert state.attributes["hvac_modes"] == [
         HVACMode.OFF,
         HVACMode.AUTO,
@@ -75,7 +75,7 @@ async def test_adam_2_climate_entity_attributes(
     state = hass.states.get("climate.lisa_badkamer")
     assert state
     assert state.state == HVACMode.AUTO
-    assert state.attributes["hvac_action"] == "heating"
+    assert state.attributes["hvac_action"] == "idle"
     assert state.attributes["hvac_modes"] == [
         HVACMode.OFF,
         HVACMode.AUTO,
@@ -101,7 +101,7 @@ async def test_adam_3_climate_entity_attributes(
     data.devices["da224107914542988a88561b4452b0f6"][
         "select_regulation_mode"
     ] = "heating"
-    data.devices["ad4838d7d35c4d6ea796ee12ae5aedf8"]["mode"] = "heat"
+    data.devices["ad4838d7d35c4d6ea796ee12ae5aedf8"]["control_state"] = "heating"
     data.devices["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"][
         "cooling_state"
     ] = False
@@ -124,7 +124,7 @@ async def test_adam_3_climate_entity_attributes(
     data.devices["da224107914542988a88561b4452b0f6"][
         "select_regulation_mode"
     ] = "cooling"
-    data.devices["ad4838d7d35c4d6ea796ee12ae5aedf8"]["mode"] = "cool"
+    data.devices["ad4838d7d35c4d6ea796ee12ae5aedf8"]["control_state"] = "cooling"
     data.devices["056ee145a816487eaa69243c3280f8bf"]["binary_sensors"][
         "cooling_state"
     ] = True