Save all updates

Author: bouwew

fixtures/adam_plus_anna_new/data.json

@@ -187,24 +187,15 @@
     },
     "dev_class": "gateway",
     "firmware": "3.9.0",
-    "gateway_modes": [
-      "away",
-      "full",
-      "vacation"
-    ],
+    "gateway_modes": ["away", "full", "vacation"],
     "hardware": "AME Smile 2.0 board",
     "location": "bc93488efab249e5bc54fd7e175a6f91",
     "mac_address": "D40FB201CBA0",
     "model": "Gateway",
     "model_id": "smile_open_therm",
     "name": "Adam",
     "notifications": {},
-    "regulation_modes": [
-      "bleeding_cold",
-      "heating",
-      "off",
-      "bleeding_hot"
-    ],
+    "regulation_modes": ["bleeding_cold", "heating", "off", "bleeding_hot"],
     "select_gateway_mode": "full",
     "select_regulation_mode": "heating",
     "sensors": {
@@ -287,13 +278,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Living room",
-    "preset_modes": [
-      "vacation",
-      "no_frost",
-      "asleep",
-      "home",
-      "away"
-    ],
+    "preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
     "select_schedule": "Weekschema",
     "sensors": {
       "electricity_consumed": 60.8,
@@ -330,13 +315,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Bathroom",
-    "preset_modes": [
-      "vacation",
-      "no_frost",
-      "asleep",
-      "home",
-      "away"
-    ],
+    "preset_modes": ["vacation", "no_frost", "asleep", "home", "away"],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -350,12 +329,8 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": [
-        "e2f4322d57924fa090fbbc48b3a140dc"
-      ],
-      "secondary": [
-        "1772a4ea304041adb83f357b751341ff"
-      ]
+      "primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
+      "secondary": ["1772a4ea304041adb83f357b751341ff"]
     },
     "vendor": "Plugwise"
   }

fixtures/m_adam_cooling/data.json

@@ -65,10 +65,10 @@
     "name": "Tom Badkamer",
     "sensors": {
       "battery": 60,
-      "setpoint": 12.0,
+      "setpoint": 20.0,
       "temperature": 21.6,
       "temperature_difference": -0.4,
-      "valve_position": 0.0
+      "valve_position": 100.0
     },
     "temperature_offset": {
       "lower_bound": -2.0,

fixtures/m_adam_heating/data.json

@@ -70,10 +70,10 @@
     "name": "Tom Badkamer",
     "sensors": {
       "battery": 60,
-      "setpoint": 12.0,
+      "setpoint": 20.0,
       "temperature": 18.6,
       "temperature_difference": -0.4,
-      "valve_position": 0.0
+      "valve_position": 100.0
     },
     "temperature_offset": {
       "lower_bound": -2.0,

plugwise/helper.py

@@ -222,9 +222,7 @@ def _appliance_info_finder(self, appl: Munch, appliance: etree.Element) -> Munch
                 # Collect heater_central entity info
                 # 251016: the added guarding below also solves Core Issue #104433
                 if not (
-                    appl := self._appl_heater_central_info(
-                        appl, appliance, False
-                    )
+                    appl := self._appl_heater_central_info(appl, appliance, False)
                 ):  # False means non-legacy entity
                     return Munch()
                 self._dhw_allowed_modes = self._get_appl_actuator_modes(

tests/data/adam/adam_plus_anna_new.json

@@ -25,6 +25,18 @@
         "dhw_cm_switch": false
       }
     },
+    "10016900610d4c7481df78c89606ef22": {
+      "available": true,
+      "dev_class": "valve_actuator_plug",
+      "location": "d9786723dbcf4f19b5c629a54629f9c7",
+      "model_id": "TS0011",
+      "name": "Aanvoer water afsluiter (nous lz3)",
+      "switches": {
+        "relay": false
+      },
+      "vendor": "_TZ3000_abjodzas",
+      "zigbee_mac_address": "A4C13862AF9917B1"
+    },
     "14df5c4dc8cb4ba69f9d1ac0eaf7c5c6": {
       "available": true,
       "binary_sensors": {
@@ -98,7 +110,7 @@
         "relay": true
       },
       "vendor": "Plugwise",
-      "zigbee_mac_address": "000D6F000D13CBA0"
+      "zigbee_mac_address": "000D6F000D13CBA1"
     },
     "29542b2b6a6a4169acecc15c72a599b8": {
       "available": true,
@@ -119,7 +131,24 @@
         "relay": true
       },
       "vendor": "Plugwise",
-      "zigbee_mac_address": "000D6F000D13CBA0"
+      "zigbee_mac_address": "000D6F000D13CBA2"
+    },
+    "67d73d0bd469422db25a618a5fb8eeb0": {
+      "available": true,
+      "dev_class": "heater_central_plug",
+      "location": "b4f211175e124df59603412bafa77a34",
+      "model": "Aqara Smart Plug",
+      "model_id": "lumi.plug.maeu01",
+      "name": "SmartPlug Floor 0",
+      "sensors": {
+        "electricity_consumed_interval": 0.0
+      },
+      "switches": {
+        "lock": false,
+        "relay": true
+      },
+      "vendor": "LUMI",
+      "zigbee_mac_address": "54EF4410002C97F2"
     },
     "854f8a9b0e7e425db97f1f110e1ce4b3": {
       "available": true,