Revert "Split off HEATER_CENTRAL_MEASUREMENTS"

This reverts commit e47108e.

Author: bouwew

plugwise/constants.py

@@ -382,28 +382,10 @@
 
 
 DEVICE_MEASUREMENTS = {
-    # Thermostat - current ambient temperature
+    # HA Core current_temperature
     "temperature": {ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS},
-    # Thermostat - setpoint
+    # HA Core setpoint
     "thermostat": {ATTR_NAME: "setpoint", ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS},
-    # Anna only
-    "outdoor_temperature": {
-        ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS
-    },  # Outdoor temp as reported on the Anna, in the App
-    "schedule_temperature": {
-        ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS
-    },  # Only present on legacy Anna and Anna_v3
-    # Lisa and Tom
-    "battery": {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE},
-    "temperature_difference": {ATTR_UNIT_OF_MEASUREMENT: DEGREE},
-    "valve_position": {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE},
-    # 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 = {
     # Anna/Adam
     "boiler_temperature": {
         ATTR_NAME: "water_temperature",
@@ -442,10 +424,24 @@
         ATTR_NAME: "water_pressure",
         ATTR_UNIT_OF_MEASUREMENT: PRESSURE_BAR,
     },
+    "outdoor_temperature": {
+        ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS
+    },  # Outdoor temp as reported on the Anna, in the App
+    "schedule_temperature": {
+        ATTR_UNIT_OF_MEASUREMENT: TEMP_CELSIUS
+    },  # Only present on legacy Anna and Anna_v3
     # Legacy Anna: similar to flame-state on Anna/Adam
     "boiler_state": {ATTR_UNIT_OF_MEASUREMENT: None},
     # Legacy Anna: shows when heating is active, don't show dhw_state, cannot be determined reliably
     "intended_boiler_state": {ATTR_UNIT_OF_MEASUREMENT: None},
+    # Lisa and Tom
+    "battery": {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE},
+    "temperature_difference": {ATTR_UNIT_OF_MEASUREMENT: DEGREE},
+    "valve_position": {ATTR_UNIT_OF_MEASUREMENT: PERCENTAGE},
+    # Plug
+    "electricity_consumed": {ATTR_UNIT_OF_MEASUREMENT: POWER_WATT},
+    "electricity_produced": {ATTR_UNIT_OF_MEASUREMENT: POWER_WATT},
+    "relay": {ATTR_UNIT_OF_MEASUREMENT: None},
 }
 
 SMILES = {