Merge pull request #908 from plugwise/wh-3

Rename water_heater dicts

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.14.5
+
+- Rename dict-keys: `max_dhw_temperature` to `dhw_temperature`, `maximum_boiler_temperature` to `boiler_temperature` via PR [#908](https://github.com/plugwise/python-plugwise/pull/908)
+
 ## v1.14.4
 
 - Correct typing of select_schedule, manual fixture update

fixtures/adam_bad_thermostat/data.json

@@ -6,27 +6,27 @@
       "flame_state": false,
       "heating_state": false
     },
+    "boiler_temperature": {
+      "current": 20.9,
+      "lower_bound": 25.0,
+      "resolution": 0.01,
+      "setpoint": 38.0,
+      "upper_bound": 45.0
+    },
     "dev_class": "heater_central",
     "dhw_mode": "eco",
     "dhw_modes": [
       "comfort",
       "eco"
     ],
-    "location": "856285a783f24bf4b2573c8bc510eabf",
-    "max_dhw_temperature": {
+    "dhw_temperature": {
       "current": 49.9,
       "lower_bound": 0.0,
       "resolution": 1.0,
       "setpoint": 50.0,
       "upper_bound": 100.0
     },
-    "maximum_boiler_temperature": {
-      "current": 20.9,
-      "lower_bound": 25.0,
-      "resolution": 0.01,
-      "setpoint": 38.0,
-      "upper_bound": 45.0
-    },
+    "location": "856285a783f24bf4b2573c8bc510eabf",
     "model": "Generic heater",
     "model_id": "1.1",
     "name": "OpenTherm",

fixtures/adam_heatpump_cooling/data.json

@@ -54,27 +54,27 @@
       "flame_state": false,
       "heating_state": false
     },
+    "boiler_temperature": {
+      "current": 24.5,
+      "lower_bound": 7.0,
+      "resolution": 0.01,
+      "setpoint": 35.0,
+      "upper_bound": 50.0
+    },
     "dev_class": "heater_central",
     "dhw_mode": "comfort",
     "dhw_modes": [
       "comfort",
       "eco"
     ],
-    "location": "eedadcb297564f1483faa509179aebed",
-    "max_dhw_temperature": {
+    "dhw_temperature": {
       "current": 63.5,
       "lower_bound": 40.0,
       "resolution": 0.01,
       "setpoint": 60.0,
       "upper_bound": 65.0
     },
-    "maximum_boiler_temperature": {
-      "current": 24.5,
-      "lower_bound": 7.0,
-      "resolution": 0.01,
-      "setpoint": 35.0,
-      "upper_bound": 50.0
-    },
+    "location": "eedadcb297564f1483faa509179aebed",
     "model": "Generic heater/cooler",
     "model_id": "17.1",
     "name": "OpenTherm",

fixtures/adam_jip/data.json

@@ -401,27 +401,27 @@
       "flame_state": false,
       "heating_state": false
     },
+    "boiler_temperature": {
+      "current": 37.3,
+      "lower_bound": 20.0,
+      "resolution": 0.01,
+      "setpoint": 90.0,
+      "upper_bound": 90.0
+    },
     "dev_class": "heater_central",
     "dhw_mode": "eco",
     "dhw_modes": [
       "comfort",
       "eco"
     ],
-    "location": "9e4433a9d69f40b3aefd15e74395eaec",
-    "max_dhw_temperature": {
+    "dhw_temperature": {
       "current": 37.3,
       "lower_bound": 40.0,
       "resolution": 0.01,
       "setpoint": 60.0,
       "upper_bound": 60.0
     },
-    "maximum_boiler_temperature": {
-      "current": 37.3,
-      "lower_bound": 20.0,
-      "resolution": 0.01,
-      "setpoint": 90.0,
-      "upper_bound": 90.0
-    },
+    "location": "9e4433a9d69f40b3aefd15e74395eaec",
     "model": "Generic heater",
     "model_id": "10.20",
     "name": "OpenTherm",

fixtures/adam_onoff_cooling_fake_firmware/data.json

@@ -7,27 +7,27 @@
       "flame_state": false,
       "heating_state": false
     },
+    "boiler_temperature": {
+      "current": 24.5,
+      "lower_bound": 7.0,
+      "resolution": 0.01,
+      "setpoint": 35.0,
+      "upper_bound": 50.0
+    },
     "dev_class": "heater_central",
     "dhw_mode": "comfort",
     "dhw_modes": [
       "comfort",
       "eco"
     ],
-    "location": "eedadcb297564f1483faa509179aebed",
-    "max_dhw_temperature": {
+    "dhw_temperature": {
       "current": 63.5,
       "lower_bound": 40.0,
       "resolution": 0.01,
       "setpoint": 60.0,
       "upper_bound": 65.0
     },
-    "maximum_boiler_temperature": {
-      "current": 24.5,
-      "lower_bound": 7.0,
-      "resolution": 0.01,
-      "setpoint": 35.0,
-      "upper_bound": 50.0
-    },
+    "location": "eedadcb297564f1483faa509179aebed",
     "model": "Unknown",
     "name": "OnOff",
     "sensors": {

fixtures/adam_plus_anna/data.json

@@ -44,19 +44,19 @@
       "flame_state": false,
       "heating_state": false
     },
-    "dev_class": "heater_central",
-    "dhw_modes": [
-      "comfort",
-      "eco"
-    ],
-    "location": "07d618f0bb80412687f065b8698ce3e7",
-    "maximum_boiler_temperature": {
+    "boiler_temperature": {
       "current": 48.0,
       "lower_bound": 0.0,
       "resolution": 1.0,
       "setpoint": 80.0,
       "upper_bound": 100.0
     },
+    "dev_class": "heater_central",
+    "dhw_modes": [
+      "comfort",
+      "eco"
+    ],
+    "location": "07d618f0bb80412687f065b8698ce3e7",
     "model": "Generic heater",
     "name": "OpenTherm",
     "select_dhw_mode": "eco",

fixtures/adam_plus_anna_new/data.json

@@ -6,19 +6,19 @@
       "flame_state": true,
       "heating_state": true
     },
-    "dev_class": "heater_central",
-    "dhw_modes": [
-      "comfort",
-      "eco"
-    ],
-    "location": "bc93488efab249e5bc54fd7e175a6f91",
-    "maximum_boiler_temperature": {
+    "boiler_temperature": {
       "current": 43.0,
       "lower_bound": 25.0,
       "resolution": 0.01,
       "setpoint": 50.0,
       "upper_bound": 95.0
     },
+    "dev_class": "heater_central",
+    "dhw_modes": [
+      "comfort",
+      "eco"
+    ],
+    "location": "bc93488efab249e5bc54fd7e175a6f91",
     "model": "Generic heater",
     "name": "OpenTherm",
     "select_dhw_mode": "eco",

fixtures/adam_plus_anna_new_regulation_off/data.json

@@ -6,19 +6,19 @@
       "flame_state": false,
       "heating_state": false
     },
-    "dev_class": "heater_central",
-    "dhw_modes": [
-      "comfort",
-      "eco"
-    ],
-    "location": "bc93488efab249e5bc54fd7e175a6f91",
-    "maximum_boiler_temperature": {
+    "boiler_temperature": {
       "current": 30.0,
       "lower_bound": 25.0,
       "resolution": 0.01,
       "setpoint": 50.0,
       "upper_bound": 95.0
     },
+    "dev_class": "heater_central",
+    "dhw_modes": [
+      "comfort",
+      "eco"
+    ],
+    "location": "bc93488efab249e5bc54fd7e175a6f91",
     "model": "Generic heater",
     "name": "OpenTherm",
     "select_dhw_mode": "eco",

fixtures/anna_elga_2_cooling/data.json

@@ -10,19 +10,19 @@
       "heating_state": false,
       "secondary_boiler_state": false
     },
-    "dev_class": "heater_central",
-    "dhw_modes": [
-      "comfort",
-      "eco"
-    ],
-    "location": "d34dfe6ab90b410c98068e75de3eb631",
-    "maximum_boiler_temperature": {
+    "boiler_temperature": {
       "current": 22.8,
       "lower_bound": 0.0,
       "resolution": 1.0,
       "setpoint": 60.0,
       "upper_bound": 100.0
     },
+    "dev_class": "heater_central",
+    "dhw_modes": [
+      "comfort",
+      "eco"
+    ],
+    "location": "d34dfe6ab90b410c98068e75de3eb631",
     "model": "Generic heater/cooler",
     "name": "OpenTherm",
     "select_dhw_mode": "comfort",

fixtures/anna_elga_2_schedule_off/data.json

@@ -10,19 +10,19 @@
       "heating_state": false,
       "secondary_boiler_state": false
     },
-    "dev_class": "heater_central",
-    "dhw_modes": [
-      "comfort",
-      "eco"
-    ],
-    "location": "d34dfe6ab90b410c98068e75de3eb631",
-    "maximum_boiler_temperature": {
+    "boiler_temperature": {
       "current": 22.8,
       "lower_bound": 0.0,
       "resolution": 1.0,
       "setpoint": 60.0,
       "upper_bound": 100.0
     },
+    "dev_class": "heater_central",
+    "dhw_modes": [
+      "comfort",
+      "eco"
+    ],
+    "location": "d34dfe6ab90b410c98068e75de3eb631",
     "model": "Generic heater/cooler",
     "name": "OpenTherm",
     "select_dhw_mode": "comfort",