Revert const-change, block unwanted locks

Author: bouwew

plugwise/constants.py

@@ -399,6 +399,7 @@
     # Plug
     "electricity_consumed": {ATTR_UNIT_OF_MEASUREMENT: POWER_WATT},
     "electricity_produced": {ATTR_UNIT_OF_MEASUREMENT: POWER_WATT},
+    "relay": {ATTR_UNIT_OF_MEASUREMENT: None},
 }
 
 HEATER_CENTRAL_MEASUREMENTS = {

plugwise/helper.py

@@ -568,17 +568,18 @@ def appliance_data(self, dev_id):
 
                     data[name] = format_measure(measure, ENERGY_WATT_HOUR)
 
-            # Adam & Stretches: detect relay switch data
+            # Adam & Stretches: find relay switch lock state
             actuator = "actuator_functionalities"
             func_type = "relay_functionality"
             if self.smile_type == "stretch" and self.smile_version[1].major == 2:
                 actuator = "actuators"
                 func_type = "relay"
-            for item, name in {"lock": "lock", "state": "relay"}.items():
-                locator = f".//{actuator}/{func_type}/{item}"
+            appl_class = appliance.find("type").text
+            if appl_class not in ["central_heating_pump", "valve_actuator"]:
+                locator = f".//{actuator}/{func_type}/lock"
                 if appliance.find(locator) is not None:
                     measure = appliance.find(locator).text
-                    data[name] = format_measure(measure, None)
+                    data["lock"] = format_measure(measure, None)
 
         # Fix for Adam + Anna: heating_state also present under Anna, remove
         if "temperature" in data: