Merge pull request #510 from plugwise/split_legacy_active

Refactor into separate paths for actual and legacy Plugwise devices

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.37.0
+
+- Refactor code into separate parts/paths for actual and legacy Plugwise devices.
+
 ## v0.36.3
 
 - Bugfixes for [#558](https://github.com/plugwise/plugwise-beta/issues/558) and [#559](https://github.com/plugwise/plugwise-beta/issues/559).

fixtures/adam_heatpump_cooling/all_data.json

@@ -4,7 +4,7 @@
       "available": true,
       "binary_sensors": {
         "cooling_state": false,
-        "dhw_state": false,
+        "dhw_state": true,
         "flame_state": false,
         "heating_state": false
       },

fixtures/adam_jip/all_data.json

@@ -67,7 +67,7 @@
       "name": "Tom Slaapkamer",
       "sensors": {
         "setpoint": 13.0,
-        "temperature": 24.3,
+        "temperature": 24.2,
         "temperature_difference": 1.7,
         "valve_position": 0.0
       },

fixtures/adam_multiple_devices_per_zone/all_data.json

@@ -28,7 +28,7 @@
       "model": "Plug",
       "name": "Playstation Smart Plug",
       "sensors": {
-        "electricity_consumed": 82.6,
+        "electricity_consumed": 84.1,
         "electricity_consumed_interval": 8.6,
         "electricity_produced": 0.0,
         "electricity_produced_interval": 0.0

fixtures/adam_onoff_cooling_fake_firmware/all_data.json

@@ -3,7 +3,7 @@
     "0ca13e8176204ca7bf6f09de59f81c83": {
       "binary_sensors": {
         "cooling_state": true,
-        "dhw_state": false,
+        "dhw_state": true,
         "flame_state": false,
         "heating_state": false
       },
@@ -25,7 +25,7 @@
       "name": "OnOff",
       "sensors": {
         "dhw_temperature": 63.5,
-        "intended_boiler_temperature": 35.0,
+        "intended_boiler_temperature": 0.0,
         "modulation_level": 0.0,
         "outdoor_air_temperature": 13.5,
         "return_temperature": 24.9,

fixtures/adam_plus_anna/all_data.json

@@ -19,7 +19,7 @@
       "name": "OpenTherm",
       "sensors": {
         "intended_boiler_temperature": 0.0,
-        "water_temperature": 47.0
+        "water_temperature": 48.0
       },
       "switches": {
         "dhw_cm_switch": false
@@ -92,7 +92,7 @@
       "location": "5ccb6c41a7d9403988d261ceee04239f",
       "name": "Work-PC",
       "sensors": {
-        "electricity_consumed": 79.8,
+        "electricity_consumed": 80.5,
         "electricity_consumed_interval": 7.03,
         "electricity_produced": 0.0,
         "electricity_produced_interval": 0.0

fixtures/adam_plus_anna_new/all_data.json

@@ -18,8 +18,8 @@
       "model": "Generic heater",
       "name": "OpenTherm",
       "sensors": {
-        "intended_boiler_temperature": 20.0,
-        "water_temperature": 29.0
+        "intended_boiler_temperature": 23.9,
+        "water_temperature": 30.0
       },
       "switches": {
         "dhw_cm_switch": false
@@ -77,7 +77,7 @@
       "model": "Plug",
       "name": "Plug Werkplek",
       "sensors": {
-        "electricity_consumed": 87.6,
+        "electricity_consumed": 91.3,
         "electricity_consumed_interval": 23.0,
         "electricity_produced": 0.0,
         "electricity_produced_interval": 0.0

fixtures/adam_zone_per_device/all_data.json

@@ -28,7 +28,7 @@
       "model": "Plug",
       "name": "Playstation Smart Plug",
       "sensors": {
-        "electricity_consumed": 81.2,
+        "electricity_consumed": 80.1,
         "electricity_consumed_interval": 12.7,
         "electricity_produced": 0.0,
         "electricity_produced_interval": 0.0
@@ -165,7 +165,7 @@
     },
     "90986d591dcd426cae3ec3e8111ff730": {
       "binary_sensors": {
-        "heating_state": false
+        "heating_state": true
       },
       "dev_class": "heater_central",
       "location": "1f9dcf83fd4e4b66b72ff787957bfe5d",
@@ -233,7 +233,7 @@
         "setpoint": 21.5,
         "temperature": 26.2,
         "temperature_difference": 3.7,
-        "valve_position": 0.0
+        "valve_position": 100
       },
       "temperature_offset": {
         "lower_bound": -2.0,

fixtures/anna_elga_2_schedule_off/all_data.json

@@ -25,7 +25,7 @@
         "domestic_hot_water_setpoint": 60.0,
         "intended_boiler_temperature": 0.0,
         "modulation_level": 0.0,
-        "outdoor_air_temperature": 14.0,
+        "outdoor_air_temperature": 13.0,
         "return_temperature": 23.4,
         "water_pressure": 0.5,
         "water_temperature": 22.8

fixtures/anna_heatpump_cooling/all_data.json

@@ -67,7 +67,7 @@
       "sensors": {
         "cooling_activation_outdoor_temperature": 21.0,
         "cooling_deactivation_threshold": 6.0,
-        "illuminance": 25.5,
+        "illuminance": 24.5,
         "setpoint_high": 22.0,
         "setpoint_low": 4.0,
         "temperature": 22.3

fixtures/anna_heatpump_cooling_fake_firmware/all_data.json

@@ -67,7 +67,7 @@
       "sensors": {
         "cooling_activation_outdoor_temperature": 21.0,
         "cooling_deactivation_threshold": 6.0,
-        "illuminance": 25.5,
+        "illuminance": 24.5,
         "setpoint_high": 22.0,
         "setpoint_low": 4.0,
         "temperature": 22.3

fixtures/anna_loria_cooling_active/all_data.json

@@ -52,6 +52,7 @@
     "bfb5ee0a88e14e5f97bfa725a760cc49": {
       "available": true,
       "binary_sensors": {
+        "cooling_enabled": true,
         "cooling_state": true,
         "dhw_state": false,
         "flame_state": false,
@@ -79,7 +80,7 @@
         "dhw_temperature": 52.9,
         "intended_boiler_temperature": 0.0,
         "modulation_level": 100,
-        "outdoor_air_temperature": 17.3,
+        "outdoor_air_temperature": 17.2,
         "return_temperature": 26.3,
         "water_temperature": 25.3
       },
@@ -94,7 +95,7 @@
     "cooling_present": true,
     "gateway_id": "9ff0569b4984459fb243af64c0901894",
     "heater_id": "bfb5ee0a88e14e5f97bfa725a760cc49",
-    "item_count": 63,
+    "item_count": 64,
     "notifications": {},
     "smile_name": "Smile Anna"
   }