From ac2e9ad4d8fb1886d2ad0ecb6392d4ea04209d23 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 23 Dec 2023 10:24:07 +0100 Subject: [PATCH 1/4] Refresh adam_plus_anna_new xml-files and adapt --- fixtures/adam_plus_anna_new/all_data.json | 88 +- fixtures/adam_plus_anna_new/device_list.json | 6 +- fixtures/m_adam_cooling/all_data.json | 50 +- fixtures/m_adam_cooling/device_list.json | 2 +- fixtures/m_adam_heating/all_data.json | 46 +- fixtures/m_adam_heating/device_list.json | 2 +- tests/test_smile.py | 248 +- .../adam_plus_anna_new/core.appliances.xml | 1209 +++---- .../core.domain_objects.xml | 2925 ++++++++-------- .../adam_plus_anna_new/core.locations.xml | 135 +- userdata/adam_plus_anna_new/core.modules.xml | 431 +-- .../adam_plus_anna_new/core.appliances.xml | 1209 +++---- .../core.domain_objects.xml | 2927 +++++++++-------- .../adam_plus_anna_new/core.locations.xml | 135 +- .../adam_plus_anna_new/core.modules.xml | 431 +-- 15 files changed, 5106 insertions(+), 4738 deletions(-) diff --git a/fixtures/adam_plus_anna_new/all_data.json b/fixtures/adam_plus_anna_new/all_data.json index d02dc923b..0725e7aa1 100644 --- a/fixtures/adam_plus_anna_new/all_data.json +++ b/fixtures/adam_plus_anna_new/all_data.json @@ -4,7 +4,7 @@ "available": true, "binary_sensors": { "dhw_state": false, - "flame_state": false, + "flame_state": true, "heating_state": true }, "dev_class": "heater_central", @@ -12,14 +12,14 @@ "maximum_boiler_temperature": { "lower_bound": 25.0, "resolution": 0.01, - "setpoint": 60.0, + "setpoint": 50.0, "upper_bound": 95.0 }, "model": "Generic heater", "name": "OpenTherm", "sensors": { - "intended_boiler_temperature": 38.1, - "water_temperature": 37.0 + "intended_boiler_temperature": 20.0, + "water_temperature": 29.0 }, "switches": { "dhw_cm_switch": false @@ -35,10 +35,10 @@ "name": "Tom Badkamer", "sensors": { "battery": 99, - "setpoint": 15.0, - "temperature": 21.6, - "temperature_difference": 2.3, - "valve_position": 0.0 + "setpoint": 18.0, + "temperature": 17.6, + "temperature_difference": -0.2, + "valve_position": 100 }, "temperature_offset": { "lower_bound": -2.0, @@ -47,18 +47,18 @@ "upper_bound": 2.0 }, "vendor": "Plugwise", - "zigbee_mac_address": "ABCD012345670A01" + "zigbee_mac_address": "000D6F000C8FF5EE" }, "2568cc4b9c1e401495d4741a5f89bee1": { "available": true, - "dev_class": "computer_desktop", + "dev_class": "hometheater", "firmware": "2020-11-10T01:00:00+01:00", "location": "f2bf9048bef64cc5b6d5110154e33c81", "model": "Plug", - "name": "Plug Werkplek", + "name": "Plug MediaTV", "sensors": { - "electricity_consumed": 98.0, - "electricity_consumed_interval": 24.0, + "electricity_consumed": 14.8, + "electricity_consumed_interval": 3.0, "electricity_produced": 0.0, "electricity_produced_interval": 0.0 }, @@ -67,18 +67,18 @@ "relay": true }, "vendor": "Plugwise", - "zigbee_mac_address": "ABCD012345670A03" + "zigbee_mac_address": "000D6F000D13CCFD" }, "29542b2b6a6a4169acecc15c72a599b8": { "available": true, - "dev_class": "hometheater", + "dev_class": "computer_desktop", "firmware": "2020-11-10T01:00:00+01:00", "location": "f2bf9048bef64cc5b6d5110154e33c81", "model": "Plug", - "name": "Plug Mediacenter", + "name": "Plug Werkplek", "sensors": { - "electricity_consumed": 12.2, - "electricity_consumed_interval": 3.0, + "electricity_consumed": 87.6, + "electricity_consumed_interval": 23.0, "electricity_produced": 0.0, "electricity_produced_interval": 0.0 }, @@ -87,7 +87,7 @@ "relay": true }, "vendor": "Plugwise", - "zigbee_mac_address": "ABCD012345670A02" + "zigbee_mac_address": "000D6F000D13CA9A" }, "67d73d0bd469422db25a618a5fb8eeb0": { "available": true, @@ -113,7 +113,7 @@ "model": "Plug", "name": "Plug Vloerverwarming", "sensors": { - "electricity_consumed": 46.8, + "electricity_consumed": 43.8, "electricity_consumed_interval": 0.0, "electricity_produced": 0.0, "electricity_produced_interval": 0.0 @@ -122,22 +122,28 @@ "relay": true }, "vendor": "Plugwise", - "zigbee_mac_address": "ABCD012345670A05" + "zigbee_mac_address": "000D6F000D13CB6F" }, "ad4838d7d35c4d6ea796ee12ae5aedf8": { - "active_preset": "asleep", - "available_schedules": ["Weekschema", "Badkamer", "Test", "off"], + "active_preset": "home", + "available_schedules": [ + "Badkamer", + "Test", + "Vakantie", + "Weekschema", + "off" + ], "control_state": "heating", "dev_class": "thermostat", "location": "f2bf9048bef64cc5b6d5110154e33c81", "mode": "auto", "model": "ThermoTouch", "name": "Anna", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"], "select_schedule": "Weekschema", "sensors": { "setpoint": 18.5, - "temperature": 18.1 + "temperature": 18.4 }, "thermostat": { "lower_bound": 1.0, @@ -152,25 +158,31 @@ "plugwise_notification": false }, "dev_class": "gateway", - "firmware": "3.6.4", + "firmware": "3.7.8", "hardware": "AME Smile 2.0 board", "location": "bc93488efab249e5bc54fd7e175a6f91", - "mac_address": "012345670001", + "mac_address": "D40FB2019891", "model": "Gateway", "name": "Adam", - "regulation_modes": ["heating", "off", "bleeding_cold", "bleeding_hot"], + "regulation_modes": ["bleeding_hot", "bleeding_cold", "off", "heating"], "select_regulation_mode": "heating", "sensors": { - "outdoor_temperature": -1.25 + "outdoor_temperature": 9.19 }, "vendor": "Plugwise", - "zigbee_mac_address": "ABCD012345670101" + "zigbee_mac_address": "000D6F000D5A168D" }, "e2f4322d57924fa090fbbc48b3a140dc": { "active_preset": "home", "available": true, - "available_schedules": ["Weekschema", "Badkamer", "Test", "off"], - "control_state": "off", + "available_schedules": [ + "Badkamer", + "Test", + "Vakantie", + "Weekschema", + "off" + ], + "control_state": "preheating", "dev_class": "zone_thermostat", "firmware": "2016-10-10T02:00:00+02:00", "hardware": "255", @@ -178,12 +190,12 @@ "mode": "auto", "model": "Lisa", "name": "Lisa Badkamer", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"], "select_schedule": "Badkamer", "sensors": { - "battery": 56, - "setpoint": 15.0, - "temperature": 17.9 + "battery": 38, + "setpoint": 18.0, + "temperature": 16.5 }, "temperature_offset": { "lower_bound": -2.0, @@ -194,11 +206,11 @@ "thermostat": { "lower_bound": 0.0, "resolution": 0.01, - "setpoint": 15.0, + "setpoint": 18.0, "upper_bound": 99.9 }, "vendor": "Plugwise", - "zigbee_mac_address": "ABCD012345670A04" + "zigbee_mac_address": "000D6F000C869B61" }, "e8ef2a01ed3b4139a53bf749204fe6b4": { "dev_class": "switching", diff --git a/fixtures/adam_plus_anna_new/device_list.json b/fixtures/adam_plus_anna_new/device_list.json index fb344d482..b4f3cf98f 100644 --- a/fixtures/adam_plus_anna_new/device_list.json +++ b/fixtures/adam_plus_anna_new/device_list.json @@ -2,11 +2,11 @@ "da224107914542988a88561b4452b0f6", "056ee145a816487eaa69243c3280f8bf", "67d73d0bd469422db25a618a5fb8eeb0", + "e2f4322d57924fa090fbbc48b3a140dc", + "854f8a9b0e7e425db97f1f110e1ce4b3", "ad4838d7d35c4d6ea796ee12ae5aedf8", "29542b2b6a6a4169acecc15c72a599b8", - "2568cc4b9c1e401495d4741a5f89bee1", - "854f8a9b0e7e425db97f1f110e1ce4b3", "1772a4ea304041adb83f357b751341ff", - "e2f4322d57924fa090fbbc48b3a140dc", + "2568cc4b9c1e401495d4741a5f89bee1", "e8ef2a01ed3b4139a53bf749204fe6b4" ] diff --git a/fixtures/m_adam_cooling/all_data.json b/fixtures/m_adam_cooling/all_data.json index 7b570a6cf..675a61162 100644 --- a/fixtures/m_adam_cooling/all_data.json +++ b/fixtures/m_adam_cooling/all_data.json @@ -5,7 +5,7 @@ "binary_sensors": { "cooling_state": true, "dhw_state": false, - "flame_state": false, + "flame_state": true, "heating_state": false }, "dev_class": "heater_central", @@ -13,7 +13,7 @@ "maximum_boiler_temperature": { "lower_bound": 25.0, "resolution": 0.01, - "setpoint": 60.0, + "setpoint": 50.0, "upper_bound": 95.0 }, "model": "Generic heater", @@ -37,8 +37,8 @@ "sensors": { "battery": 99, "temperature": 21.6, - "temperature_difference": 2.3, - "valve_position": 0.0 + "temperature_difference": -0.2, + "valve_position": 100 }, "temperature_offset": { "lower_bound": -2.0, @@ -47,19 +47,25 @@ "upper_bound": 2.0 }, "vendor": "Plugwise", - "zigbee_mac_address": "ABCD012345670A01" + "zigbee_mac_address": "000D6F000C8FF5EE" }, "ad4838d7d35c4d6ea796ee12ae5aedf8": { - "active_preset": "asleep", + "active_preset": "home", "available": true, - "available_schedules": ["Weekschema", "Badkamer", "Test", "off"], + "available_schedules": [ + "Badkamer", + "Test", + "Vakantie", + "Weekschema", + "off" + ], "control_state": "cooling", "dev_class": "thermostat", "location": "f2bf9048bef64cc5b6d5110154e33c81", "mode": "cool", "model": "ThermoTouch", "name": "Anna", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"], "select_schedule": "Weekschema", "selected_schedule": "None", "sensors": { @@ -79,17 +85,17 @@ "plugwise_notification": false }, "dev_class": "gateway", - "firmware": "3.6.4", + "firmware": "3.7.8", "hardware": "AME Smile 2.0 board", "location": "bc93488efab249e5bc54fd7e175a6f91", - "mac_address": "012345670001", + "mac_address": "D40FB2019891", "model": "Gateway", "name": "Adam", "regulation_modes": [ - "heating", - "off", - "bleeding_cold", "bleeding_hot", + "bleeding_cold", + "off", + "heating", "cooling" ], "select_regulation_mode": "cooling", @@ -97,13 +103,19 @@ "outdoor_temperature": 29.65 }, "vendor": "Plugwise", - "zigbee_mac_address": "ABCD012345670101" + "zigbee_mac_address": "000D6F000D5A168D" }, "e2f4322d57924fa090fbbc48b3a140dc": { "active_preset": "home", "available": true, - "available_schedules": ["Weekschema", "Badkamer", "Test", "off"], - "control_state": "off", + "available_schedules": [ + "Badkamer", + "Test", + "Vakantie", + "Weekschema", + "off" + ], + "control_state": "preheating", "dev_class": "zone_thermostat", "firmware": "2016-10-10T02:00:00+02:00", "hardware": "255", @@ -111,10 +123,10 @@ "mode": "auto", "model": "Lisa", "name": "Lisa Badkamer", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"], "select_schedule": "Badkamer", "sensors": { - "battery": 56, + "battery": 38, "setpoint": 23.5, "temperature": 23.9 }, @@ -131,7 +143,7 @@ "upper_bound": 99.9 }, "vendor": "Plugwise", - "zigbee_mac_address": "ABCD012345670A04" + "zigbee_mac_address": "000D6F000C869B61" }, "e8ef2a01ed3b4139a53bf749204fe6b4": { "dev_class": "switching", diff --git a/fixtures/m_adam_cooling/device_list.json b/fixtures/m_adam_cooling/device_list.json index f78b4cd38..35fe367eb 100644 --- a/fixtures/m_adam_cooling/device_list.json +++ b/fixtures/m_adam_cooling/device_list.json @@ -1,8 +1,8 @@ [ "da224107914542988a88561b4452b0f6", "056ee145a816487eaa69243c3280f8bf", + "e2f4322d57924fa090fbbc48b3a140dc", "ad4838d7d35c4d6ea796ee12ae5aedf8", "1772a4ea304041adb83f357b751341ff", - "e2f4322d57924fa090fbbc48b3a140dc", "e8ef2a01ed3b4139a53bf749204fe6b4" ] diff --git a/fixtures/m_adam_heating/all_data.json b/fixtures/m_adam_heating/all_data.json index 572590476..3b1f5f8cd 100644 --- a/fixtures/m_adam_heating/all_data.json +++ b/fixtures/m_adam_heating/all_data.json @@ -27,7 +27,7 @@ "available": true, "binary_sensors": { "dhw_state": false, - "flame_state": false, + "flame_state": true, "heating_state": true }, "dev_class": "heater_central", @@ -41,7 +41,7 @@ "maximum_boiler_temperature": { "lower_bound": 25.0, "resolution": 0.01, - "setpoint": 60.0, + "setpoint": 50.0, "upper_bound": 95.0 }, "model": "Generic heater", @@ -65,8 +65,8 @@ "sensors": { "battery": 99, "temperature": 18.6, - "temperature_difference": 2.3, - "valve_position": 0.0 + "temperature_difference": -0.2, + "valve_position": 100 }, "temperature_offset": { "lower_bound": -2.0, @@ -75,19 +75,25 @@ "upper_bound": 2.0 }, "vendor": "Plugwise", - "zigbee_mac_address": "ABCD012345670A01" + "zigbee_mac_address": "000D6F000C8FF5EE" }, "ad4838d7d35c4d6ea796ee12ae5aedf8": { - "active_preset": "asleep", + "active_preset": "home", "available": true, - "available_schedules": ["Weekschema", "Badkamer", "Test", "off"], + "available_schedules": [ + "Badkamer", + "Test", + "Vakantie", + "Weekschema", + "off" + ], "control_state": "preheating", "dev_class": "thermostat", "location": "f2bf9048bef64cc5b6d5110154e33c81", "mode": "heat", "model": "ThermoTouch", "name": "Anna", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"], "select_schedule": "Weekschema", "selected_schedule": "None", "sensors": { @@ -107,25 +113,31 @@ "plugwise_notification": false }, "dev_class": "gateway", - "firmware": "3.6.4", + "firmware": "3.7.8", "hardware": "AME Smile 2.0 board", "location": "bc93488efab249e5bc54fd7e175a6f91", - "mac_address": "012345670001", + "mac_address": "D40FB2019891", "model": "Gateway", "name": "Adam", - "regulation_modes": ["heating", "off", "bleeding_cold", "bleeding_hot"], + "regulation_modes": ["bleeding_hot", "bleeding_cold", "off", "heating"], "select_regulation_mode": "heating", "sensors": { "outdoor_temperature": -1.25 }, "vendor": "Plugwise", - "zigbee_mac_address": "ABCD012345670101" + "zigbee_mac_address": "000D6F000D5A168D" }, "e2f4322d57924fa090fbbc48b3a140dc": { "active_preset": "home", "available": true, - "available_schedules": ["Weekschema", "Badkamer", "Test", "off"], - "control_state": "off", + "available_schedules": [ + "Badkamer", + "Test", + "Vakantie", + "Weekschema", + "off" + ], + "control_state": "preheating", "dev_class": "zone_thermostat", "firmware": "2016-10-10T02:00:00+02:00", "hardware": "255", @@ -133,10 +145,10 @@ "mode": "auto", "model": "Lisa", "name": "Lisa Badkamer", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"], "select_schedule": "Badkamer", "sensors": { - "battery": 56, + "battery": 38, "setpoint": 15.0, "temperature": 17.9 }, @@ -153,7 +165,7 @@ "upper_bound": 99.9 }, "vendor": "Plugwise", - "zigbee_mac_address": "ABCD012345670A04" + "zigbee_mac_address": "000D6F000C869B61" }, "e8ef2a01ed3b4139a53bf749204fe6b4": { "dev_class": "switching", diff --git a/fixtures/m_adam_heating/device_list.json b/fixtures/m_adam_heating/device_list.json index f78b4cd38..35fe367eb 100644 --- a/fixtures/m_adam_heating/device_list.json +++ b/fixtures/m_adam_heating/device_list.json @@ -1,8 +1,8 @@ [ "da224107914542988a88561b4452b0f6", "056ee145a816487eaa69243c3280f8bf", + "e2f4322d57924fa090fbbc48b3a140dc", "ad4838d7d35c4d6ea796ee12ae5aedf8", "1772a4ea304041adb83f357b751341ff", - "e2f4322d57924fa090fbbc48b3a140dc", "e8ef2a01ed3b4139a53bf749204fe6b4" ] diff --git a/tests/test_smile.py b/tests/test_smile.py index 569f4884a..23f0537a2 100644 --- a/tests/test_smile.py +++ b/tests/test_smile.py @@ -1584,6 +1584,44 @@ async def test_connect_adam_plus_anna_copy_with_error_domain_added(self): async def test_connect_adam_plus_anna_new(self): """Test extended Adam (firmware 3.6) with Anna and a switch-group setup.""" testdata = { + "da224107914542988a88561b4452b0f6": { + "dev_class": "gateway", + "firmware": "3.7.8", + "hardware": "AME Smile 2.0 board", + "location": "bc93488efab249e5bc54fd7e175a6f91", + "mac_address": "012345679891", + "model": "Gateway", + "name": "Adam", + "zigbee_mac_address": "000D6F000D5A168D", + "vendor": "Plugwise", + "binary_sensors": {"plugwise_notification": False}, + "sensors": {"outdoor_temperature": 9.19}, + "select_regulation_mode": "heating", + "regulation_modes": ["bleeding_hot", "bleeding_cold", "off", "heating"], + }, + "056ee145a816487eaa69243c3280f8bf": { + "dev_class": "heater_central", + "location": "bc93488efab249e5bc54fd7e175a6f91", + "model": "Generic heater", + "name": "OpenTherm", + "binary_sensors": { + "dhw_state": False, + "heating_state": True, + "flame_state": True, + }, + "sensors": { + "water_temperature": 29.0, + "intended_boiler_temperature": 20.0, + }, + "switches": {"dhw_cm_switch": False}, + "maximum_boiler_temperature": { + "setpoint": 50.0, + "resolution": 0.01, + "lower_bound": 25.0, + "upper_bound": 95.0, + }, + "available": True, + }, "67d73d0bd469422db25a618a5fb8eeb0": { "dev_class": "zz_misc", "location": "b4f211175e124df59603412bafa77a34", @@ -1591,80 +1629,105 @@ async def test_connect_adam_plus_anna_new(self): "name": "SmartPlug Floor 0", "zigbee_mac_address": "54EF4410002C97F2", "vendor": "LUMI", - "available": True, "sensors": {"electricity_consumed_interval": 0.0}, "switches": {"relay": True, "lock": False}, + "available": True, }, - "ad4838d7d35c4d6ea796ee12ae5aedf8": { - "dev_class": "thermostat", - "location": "f2bf9048bef64cc5b6d5110154e33c81", - "model": "ThermoTouch", - "name": "Anna", + "e2f4322d57924fa090fbbc48b3a140dc": { + "dev_class": "zone_thermostat", + "firmware": "2016-10-10T02:00:00+02:00", + "hardware": "255", + "location": "f871b8c4d63549319221e294e4f88074", + "model": "Lisa", + "name": "Lisa Badkamer", + "zigbee_mac_address": "000D6F000C869B61", "vendor": "Plugwise", + "sensors": {"temperature": 16.5, "setpoint": 18.0, "battery": 38}, + "temperature_offset": { + "lower_bound": -2.0, + "resolution": 0.1, + "upper_bound": 2.0, + "setpoint": 0.0, + }, "thermostat": { - "setpoint": 18.5, - "lower_bound": 1.0, - "upper_bound": 35.0, + "setpoint": 18.0, "resolution": 0.01, + "lower_bound": 0.0, + "upper_bound": 99.9, }, - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "active_preset": "asleep", - "available_schedules": ["Weekschema", "Badkamer", "Test", "off"], - "select_schedule": "Weekschema", - "control_state": "heating", + "available": True, + "control_state": "preheating", + "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"], + "active_preset": "home", + "available_schedules": [ + "Badkamer", + "Test", + "Vakantie", + "Weekschema", + "off", + ], + "select_schedule": "Badkamer", "mode": "auto", - "sensors": {"temperature": 18.1, "setpoint": 18.5}, }, - "29542b2b6a6a4169acecc15c72a599b8": { - "dev_class": "hometheater", + "854f8a9b0e7e425db97f1f110e1ce4b3": { + "dev_class": "central_heating_pump", "firmware": "2020-11-10T01:00:00+01:00", "location": "f2bf9048bef64cc5b6d5110154e33c81", "model": "Plug", - "name": "Plug Mediacenter", - "zigbee_mac_address": "ABCD012345670A02", + "name": "Plug Vloerverwarming", + "zigbee_mac_address": "000D6F000D13CB6F", "vendor": "Plugwise", - "available": True, "sensors": { - "electricity_consumed": 12.2, - "electricity_consumed_interval": 3.0, + "electricity_consumed": 43.8, + "electricity_consumed_interval": 0.0, "electricity_produced": 0.0, "electricity_produced_interval": 0.0, }, - "switches": {"relay": True, "lock": False}, + "switches": {"relay": True}, + "available": True, }, - "2568cc4b9c1e401495d4741a5f89bee1": { - "dev_class": "computer_desktop", - "firmware": "2020-11-10T01:00:00+01:00", + "ad4838d7d35c4d6ea796ee12ae5aedf8": { + "dev_class": "thermostat", "location": "f2bf9048bef64cc5b6d5110154e33c81", - "model": "Plug", - "name": "Plug Werkplek", - "zigbee_mac_address": "ABCD012345670A03", + "model": "ThermoTouch", + "name": "Anna", "vendor": "Plugwise", - "available": True, - "sensors": { - "electricity_consumed": 98.0, - "electricity_consumed_interval": 24.0, - "electricity_produced": 0.0, - "electricity_produced_interval": 0.0, + "sensors": {"temperature": 18.4, "setpoint": 18.5}, + "thermostat": { + "setpoint": 18.5, + "resolution": 0.01, + "lower_bound": 1.0, + "upper_bound": 35.0, }, - "switches": {"relay": True, "lock": True}, + "control_state": "heating", + "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"], + "active_preset": "home", + "available_schedules": [ + "Badkamer", + "Test", + "Vakantie", + "Weekschema", + "off", + ], + "select_schedule": "Weekschema", + "mode": "auto", }, - "854f8a9b0e7e425db97f1f110e1ce4b3": { - "dev_class": "central_heating_pump", + "29542b2b6a6a4169acecc15c72a599b8": { + "dev_class": "computer_desktop", "firmware": "2020-11-10T01:00:00+01:00", "location": "f2bf9048bef64cc5b6d5110154e33c81", "model": "Plug", - "name": "Plug Vloerverwarming", - "zigbee_mac_address": "ABCD012345670A05", + "name": "Plug Werkplek", + "zigbee_mac_address": "000D6F000D13CA9A", "vendor": "Plugwise", - "available": True, "sensors": { - "electricity_consumed": 46.8, - "electricity_consumed_interval": 0.0, + "electricity_consumed": 87.6, + "electricity_consumed_interval": 23.0, "electricity_produced": 0.0, "electricity_produced_interval": 0.0, }, - "switches": {"relay": True}, + "switches": {"relay": True, "lock": False}, + "available": True, }, "1772a4ea304041adb83f357b751341ff": { "dev_class": "thermo_sensor", @@ -1673,78 +1736,39 @@ async def test_connect_adam_plus_anna_new(self): "location": "f871b8c4d63549319221e294e4f88074", "model": "Tom/Floor", "name": "Tom Badkamer", - "zigbee_mac_address": "ABCD012345670A01", + "zigbee_mac_address": "000D6F000C8FF5EE", "vendor": "Plugwise", - "available": True, "sensors": { - "temperature": 21.6, - "setpoint": 15.0, + "temperature": 17.6, + "setpoint": 18.0, "battery": 99, - "temperature_difference": 2.3, - "valve_position": 0.0, + "temperature_difference": -0.2, + "valve_position": 100, }, - }, - "e2f4322d57924fa090fbbc48b3a140dc": { - "dev_class": "zone_thermostat", - "firmware": "2016-10-10T02:00:00+02:00", - "hardware": "255", - "location": "f871b8c4d63549319221e294e4f88074", - "model": "Lisa", - "name": "Lisa Badkamer", - "zigbee_mac_address": "ABCD012345670A04", - "vendor": "Plugwise", - "thermostat": { - "setpoint": 15.0, - "lower_bound": 0.0, - "upper_bound": 99.9, - "resolution": 0.01, + "temperature_offset": { + "lower_bound": -2.0, + "resolution": 0.1, + "upper_bound": 2.0, + "setpoint": 0.1, }, "available": True, - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], - "active_preset": "home", - "available_schedules": ["Weekschema", "Badkamer", "Test", "off"], - "select_schedule": "Badkamer", - "control_state": "off", - "mode": "auto", - "sensors": {"temperature": 17.9, "setpoint": 15.0, "battery": 56}, }, - "da224107914542988a88561b4452b0f6": { - "dev_class": "gateway", - "firmware": "3.6.4", - "hardware": "AME Smile 2.0 board", - "location": "bc93488efab249e5bc54fd7e175a6f91", - "mac_address": "012345670001", - "model": "Gateway", - "name": "Adam", - "zigbee_mac_address": "ABCD012345670101", + "2568cc4b9c1e401495d4741a5f89bee1": { + "dev_class": "hometheater", + "firmware": "2020-11-10T01:00:00+01:00", + "location": "f2bf9048bef64cc5b6d5110154e33c81", + "model": "Plug", + "name": "Plug MediaTV", + "zigbee_mac_address": "000D6F000D13CCFD", "vendor": "Plugwise", - "select_regulation_mode": "heating", - "regulation_modes": ["heating", "off", "bleeding_cold", "bleeding_hot"], - "binary_sensors": {"plugwise_notification": False}, - "sensors": {"outdoor_temperature": -1.25}, - }, - "056ee145a816487eaa69243c3280f8bf": { - "dev_class": "heater_central", - "location": "bc93488efab249e5bc54fd7e175a6f91", - "model": "Generic heater", - "name": "OpenTherm", - "maximum_boiler_temperature": { - "setpoint": 60.0, - "lower_bound": 25.0, - "upper_bound": 95.0, - "resolution": 0.01, - }, - "available": True, - "binary_sensors": { - "dhw_state": False, - "heating_state": True, - "flame_state": False, - }, "sensors": { - "water_temperature": 37.0, - "intended_boiler_temperature": 38.1, + "electricity_consumed": 14.8, + "electricity_consumed_interval": 3.0, + "electricity_produced": 0.0, + "electricity_produced_interval": 0.0, }, - "switches": {"dhw_cm_switch": False}, + "switches": {"relay": True, "lock": True}, + "available": True, }, "e8ef2a01ed3b4139a53bf749204fe6b4": { "dev_class": "switching", @@ -1798,11 +1822,11 @@ async def test_connect_adam_plus_anna_new(self): _LOGGER.info("Basics:") _LOGGER.info(" # Assert version") - assert smile.smile_version[0] == "3.6.4" + assert smile.smile_version[0] == "3.7.8" _LOGGER.info(" # Assert legacy") assert not smile._smile_legacy - await self.device_test(smile, "2022-01-16 00:00:01", testdata) + await self.device_test(smile, "2023-12-17 00:00:01", testdata) assert smile.gateway_id == "da224107914542988a88561b4452b0f6" assert smile._last_active["f2bf9048bef64cc5b6d5110154e33c81"] == "Weekschema" assert smile._last_active["f871b8c4d63549319221e294e4f88074"] == "Badkamer" @@ -1811,12 +1835,12 @@ async def test_connect_adam_plus_anna_new(self): "da224107914542988a88561b4452b0f6", "056ee145a816487eaa69243c3280f8bf", "67d73d0bd469422db25a618a5fb8eeb0", + "e2f4322d57924fa090fbbc48b3a140dc", + "854f8a9b0e7e425db97f1f110e1ce4b3", "ad4838d7d35c4d6ea796ee12ae5aedf8", "29542b2b6a6a4169acecc15c72a599b8", - "2568cc4b9c1e401495d4741a5f89bee1", - "854f8a9b0e7e425db97f1f110e1ce4b3", "1772a4ea304041adb83f357b751341ff", - "e2f4322d57924fa090fbbc48b3a140dc", + "2568cc4b9c1e401495d4741a5f89bee1", "e8ef2a01ed3b4139a53bf749204fe6b4", ] @@ -1889,7 +1913,7 @@ async def test_connect_adam_plus_anna_new(self): # emulating reading newer dataset after an update_interval self.smile_setup = "updated/adam_plus_anna_new" await self.device_test( - smile, "2022-01-16 00:00:01", testdata_updated, initialize=False + smile, "2023-12-17 00:00:01", testdata_updated, initialize=False ) await smile.close_connection() diff --git a/userdata/adam_plus_anna_new/core.appliances.xml b/userdata/adam_plus_anna_new/core.appliances.xml index 35410a802..94a070d93 100644 --- a/userdata/adam_plus_anna_new/core.appliances.xml +++ b/userdata/adam_plus_anna_new/core.appliances.xml @@ -6,6 +6,7 @@ zz_misc 2022-03-11T11:21:58.858+01:00 2022-06-13T15:15:12.921+02:00 + 2023-12-22T16:18:09.841+01:00 @@ -13,12 +14,12 @@ electricity_consumed Wh - 2022-06-13T15:00:00+02:00 - 2022-06-13T14:45:00+02:00 + 2023-12-22T16:15:00+01:00 + 2023-12-22T16:00:00+01:00 PT15M - - 0.00 + + 0.00 @@ -32,30 +33,181 @@ relay - 2022-06-13T15:15:12.918+02:00 + 2023-12-22T16:18:09.841+01:00 2022-06-11T15:25:12.796+02:00 - - on + + on - 2022-06-13T15:15:12.918+02:00 + 2023-12-22T16:18:09.841+01:00 false on + + Lisa Badkamer + A zone thermostat regulates the temperature in a heating zone (generally a room). + zone_thermostat + 2021-12-16T19:31:01.653+01:00 + 2023-12-22T16:18:09.841+01:00 + + + + + + temperature + C + 2023-12-22T16:18:09.838+01:00 + 2023-12-22T16:18:09.838+01:00 + PT3H + + + 16.50 + + + + temperature_offset + C + 2023-12-10T15:48:43.424+01:00 + 2023-12-10T15:48:43.424+01:00 + + + + 0.00 + + + + battery + + 2023-12-22T13:59:02.810+01:00 + 2023-12-22T13:59:02.810+01:00 + + + + 0.38 + + + + thermostat + C + 2023-12-22T07:00:05.510+01:00 + 2023-12-22T07:00:05.510+01:00 + + + + 18.00 + + + + + + 2023-12-22T07:00:05.511+01:00 + thermostat + 0 + 99.9 + 0.01 + 18 + + + + + + 2023-12-10T15:48:43.425+01:00 + temperature_offset + 0 + + + + + Plug Vloerverwarming + A smart plug that can be switched on/off and measure power usage. + central_heating_pump + 2021-12-16T19:30:44.323+01:00 + 2023-12-22T16:30:17.811+01:00 + + + + + + + + electricity_consumed + Wh + 2023-12-22T16:15:00+01:00 + 2023-12-22T16:00:00+01:00 + PT15M + + + 0.00 + + + + electricity_produced + W + 2023-12-22T16:30:10.365+01:00 + 2023-12-22T16:30:10.365+01:00 + + + + 0.00 + + + + electricity_consumed + W + 2023-12-22T16:30:10.365+01:00 + 2023-12-22T16:30:10.365+01:00 + + + + 43.81 + + + + relay + + 2023-12-22T16:30:17.808+01:00 + 2023-12-22T16:30:17.808+01:00 + + + + on + + + + electricity_produced + Wh + 2023-12-22T16:15:00+01:00 + 2023-12-22T16:00:00+01:00 + PT15M + + + 0.00 + + + + + + 2023-12-22T16:30:17.808+01:00 + false + on + + + + Anna A Thermostat thermostat 2021-12-16T19:30:53.779+01:00 - 2022-01-11T08:04:41.345+01:00 + 2023-12-22T16:30:19.645+01:00 @@ -65,45 +217,45 @@ thermostat C - 2022-01-11T08:04:37.540+01:00 - 2022-01-11T07:30:01.205+01:00 + 2023-12-22T16:30:00.357+01:00 + 2023-12-22T16:30:00.357+01:00 - - 18.50 + + 18.50 intended_domestic_hot_water_comfort_mode - 2022-01-11T08:02:32.114+01:00 - 2021-12-18T11:58:29.735+01:00 + 2023-12-22T16:27:51.647+01:00 + 2023-12-22T16:27:51.647+01:00 - - off + + on intended_central_heating_state - 2022-01-11T08:02:32.114+01:00 - 2022-01-11T07:31:09.731+01:00 + 2023-12-22T16:27:51.647+01:00 + 2023-12-22T16:27:51.647+01:00 - - on + + off temperature C - 2022-01-11T08:04:41.331+01:00 - 2022-01-11T08:04:41.331+01:00 + 2023-12-22T16:30:19.629+01:00 + 2023-12-22T16:30:19.629+01:00 PT3H - - 18.13 + + 18.36 @@ -120,279 +272,335 @@ - 2022-01-11T08:04:37.540+01:00 + 2023-12-22T16:30:00.358+01:00 thermostat - 18.5 1 35 0.01 + 18.5 - - OpenThermGateway - An OpenTherm Gateway - open_therm_gateway - 2021-12-16T19:30:28.533+01:00 - 2021-12-16T19:30:37.717+01:00 + + Central heating boiler + + heater_central + 2021-12-16T19:30:21.331+01:00 + 2023-12-22T16:30:27.732+01:00 - - override_mode + + central_heater_water_pressure + bar + 2021-12-18T01:06:46.593+01:00 + 2021-12-16T19:30:25.237+01:00 + + + + 6.00 + + + + domestic_hot_water_burner_operation_time + hr + 2023-12-22T16:05:58+01:00 + 2023-12-22T16:05:58+01:00 + + + + 894 + + + + maximum_boiler_temperature + C + 2023-10-17T20:06:13.882+02:00 + 2023-10-17T20:06:13.882+02:00 + + + + 50.00 + + + + cooling_state - 2021-12-28T05:55:26.528+01:00 - 2021-12-16T19:30:28.747+01:00 + 2023-12-19T10:05:37.544+01:00 + 2023-12-19T10:05:37.544+01:00 - - - on + + + off - - open_therm_power_mode + + central_heating_state - 2021-12-28T05:55:27.106+01:00 - 2021-12-16T19:30:37.709+01:00 + 2023-12-22T16:30:24.455+01:00 + 2023-12-22T16:30:24.455+01:00 - - - 0 + + + on - - - - - Plug Mediacenter - A smart plug that can be switched on/off and measure power usage. - hometheater - 2021-12-16T19:30:42.936+01:00 - 2022-01-11T08:03:16.608+01:00 - - - - - - - - electricity_produced - Wh - 2022-01-11T07:45:00+01:00 - 2022-01-11T07:30:00+01:00 - PT15M - - - 0.00 + + intended_central_heating_state + + 2023-12-22T16:30:02.548+01:00 + 2023-12-22T16:30:02.548+01:00 + + + + on - - - electricity_produced - W - 2022-01-11T08:02:14.520+01:00 - 2021-12-18T10:32:48.917+01:00 + + + failed_burner_flame_ignitions + + 2023-03-24T14:52:56+01:00 + 2023-03-24T14:52:56+01:00 - - - 0.00 + + + 33 + + + + burner_starts + + 2023-12-22T16:30:12+01:00 + 2023-12-22T16:30:12+01:00 + + + + 44861 + + + + domestic_hot_water_state + + 2023-12-21T08:10:38.942+01:00 + 2023-12-21T08:10:38.942+01:00 + + + + off - - relay + + boiler_temperature + C + 2023-12-22T16:30:27.709+01:00 + 2023-12-22T16:30:27.709+01:00 + PT1H + + + 29.00 + + + + intended_boiler_temperature + C + 2023-12-22T16:30:03.614+01:00 + 2023-12-22T16:30:03.614+01:00 + + + + 20.00 + + + + open_therm_oem_fault_code - 2022-01-11T08:03:16.606+01:00 - 2022-01-09T16:55:15.512+01:00 + 2023-12-22T11:11:02.869+01:00 + 2023-12-22T11:11:02.868+01:00 - - - on + + + 255 - - electricity_consumed - Wh - 2022-01-11T07:45:00+01:00 - 2022-01-11T07:30:00+01:00 - PT15M - - - 3.00 + + burner_operation_time + s + 2023-12-22T16:00:00+01:00 + 2023-12-22T15:00:00+01:00 + PT1H + + + 16 - - electricity_consumed - W - 2022-01-11T08:02:14.520+01:00 - 2022-01-11T04:08:56.142+01:00 + + burner_operation_time + hr + 2023-12-22T12:35:33+01:00 + 2023-12-22T12:35:33+01:00 - - - 12.19 + + + 10721 + + + + domestic_hot_water_comfort_mode + + 2023-08-17T00:05:50.772+02:00 + 2023-08-17T00:05:50.772+02:00 + + + + off - - - - 2022-01-11T08:03:16.606+01:00 - false - on - - - - - - Plug Werkplek - A smart plug that can be switched on/off and measure power usage. - computer_desktop - 2021-12-16T19:30:45.677+01:00 - 2022-01-11T08:04:49.718+01:00 - - - - - - - - electricity_consumed - W - 2022-01-11T08:04:49.716+01:00 - 2022-01-11T08:04:49.716+01:00 + + flame_state + + 2023-12-22T16:30:24.472+01:00 + 2023-12-22T16:30:24.472+01:00 - - - 98.00 + + + on - - electricity_produced - W - 2022-01-11T08:04:49.717+01:00 - 2021-12-18T10:33:01.826+01:00 + + cooling_enabled + + 2023-12-10T11:40:02.026+01:00 + 2023-12-10T11:40:02.026+01:00 - - - 0.00 + + + off - - electricity_consumed - Wh - 2022-01-11T08:00:00+01:00 - 2022-01-11T07:45:00+01:00 - PT15M - - - 24.00 + + failed_burner_starts + + 2021-12-17T19:07:02+01:00 + 2021-12-17T19:07:02+01:00 + + + + 3 - - - relay + + + open_therm_application_specific_fault_code - 2022-01-11T08:02:24.183+01:00 - 2021-12-16T19:30:48.124+01:00 + 2023-12-22T11:11:02.869+01:00 + 2023-12-22T11:11:02.868+01:00 - - - on + + + 0 - - electricity_produced - Wh - 2022-01-11T08:00:00+01:00 - 2022-01-11T07:45:00+01:00 - PT15M - - - 0.00 - - - - 2022-01-11T08:02:24.183+01:00 - true - on - - + + + 2023-08-17T00:05:50.772+02:00 + domestic_hot_water_comfort_mode + off + + + + 2023-12-10T11:40:02.026+01:00 + cooling_enabled + off + + + 2023-10-17T20:06:13.883+02:00 + maximum_boiler_temperature + 25 + 95 + 0.01 + 50 + + + - - Plug Vloerverwarming + + Plug Werkplek A smart plug that can be switched on/off and measure power usage. - central_heating_pump - 2021-12-16T19:30:44.323+01:00 - 2022-01-11T08:04:54.184+01:00 + computer_desktop + 2021-12-16T19:30:42.936+01:00 + 2023-12-22T16:30:24.573+01:00 - + - - electricity_consumed + + electricity_produced Wh - 2022-01-11T08:00:00+01:00 - 2022-01-11T07:45:00+01:00 + 2023-12-22T16:15:00+01:00 + 2023-12-22T16:00:00+01:00 PT15M - - - 0.00 + + + 0.00 - + electricity_produced W - 2022-01-11T07:59:27.387+01:00 - 2021-12-18T10:45:21.429+01:00 - - - - 0.00 - - - - electricity_consumed - W - 2022-01-11T07:59:27.386+01:00 - 2022-01-11T07:59:27.386+01:00 + 2023-12-22T16:30:24.542+01:00 + 2023-12-22T16:30:24.542+01:00 - - - 46.81 + + + 0.00 - + relay - 2022-01-11T08:04:29.116+01:00 - 2022-01-11T07:30:02.865+01:00 + 2023-12-22T16:24:29.783+01:00 + 2023-12-22T16:24:29.783+01:00 - - - on + + + on - - electricity_produced + + electricity_consumed Wh - 2022-01-11T08:00:00+01:00 - 2022-01-11T07:45:00+01:00 + 2023-12-22T16:15:00+01:00 + 2023-12-22T16:00:00+01:00 PT15M - - - 0.00 + + + 23.00 + + electricity_consumed + W + 2023-12-22T16:30:24.542+01:00 + 2023-12-22T16:30:24.542+01:00 + + + + 87.63 + + - - 2022-01-11T08:04:29.116+01:00 + + 2023-12-22T16:24:29.783+01:00 false on - + @@ -401,7 +609,7 @@ A thermostatic radiator valve allows hot water to be pumped into its radiator based on ambient temperature and the local temperature setpoint. thermostatic_radiator_valve 2021-12-16T19:32:25.043+01:00 - 2022-01-11T08:04:42.415+01:00 + 2023-12-22T16:22:29.987+01:00 @@ -409,524 +617,337 @@ thermostat C - 2022-01-11T08:04:34.409+01:00 - 2022-01-11T08:04:34.409+01:00 + 2023-12-22T07:02:11.280+01:00 + 2023-12-22T07:02:11.280+01:00 - - 15.00 + + 18.00 temperature_difference C - 2022-01-11T07:58:02.900+01:00 - 2022-01-11T07:58:02.900+01:00 + 2023-12-22T15:31:28.848+01:00 + 2023-12-22T15:31:28.848+01:00 - - 2.30 + + -0.20 temperature C - 2022-01-11T08:03:12.437+01:00 - 2022-01-11T08:03:12.437+01:00 + 2023-12-22T16:22:29.981+01:00 + 2023-12-22T16:22:29.981+01:00 PT3H - - 21.58 + + 17.56 battery - 2022-01-11T06:00:34.991+01:00 - 2021-12-17T19:02:18.751+01:00 + 2023-12-22T10:13:07.513+01:00 + 2023-12-22T10:13:07.513+01:00 - - 0.99 + + 0.99 temperature_offset C - 2021-12-31T12:55:52.153+01:00 - 2021-12-16T19:34:25.529+01:00 + 2023-12-13T09:39:02.838+01:00 + 2023-12-13T09:39:02.838+01:00 - - 0.10 + + 0.10 valve_position - 2022-01-11T08:04:42.410+01:00 - 2022-01-11T08:04:42.410+01:00 + 2023-12-22T04:32:11.454+01:00 + 2023-12-22T04:32:11.454+01:00 - - 0.00 + + 1.00 uncorrected_temperature C - 2022-01-11T08:03:12.437+01:00 - 2022-01-11T08:03:12.437+01:00 + 2023-12-22T16:22:29.981+01:00 + 2023-12-22T16:22:29.981+01:00 - - 21.58 + + 17.56 + + + + + + + 2023-12-13T09:39:02.839+01:00 + temperature_offset + 0.1 + + + 2023-12-22T07:02:11.281+01:00 + thermostat + 7 + 30 + 0.01 + 18 + + + + + + + Plug MediaTV + A smart plug that can be switched on/off and measure power usage. + hometheater + 2021-12-16T19:30:45.677+01:00 + 2023-12-22T16:30:00.299+01:00 + + + + + + + + electricity_consumed + W + 2023-12-22T16:29:13.997+01:00 + 2023-12-22T16:29:13.997+01:00 + + + + 14.81 + + + + electricity_produced + W + 2023-12-22T16:29:13.997+01:00 + 2023-12-22T16:29:13.997+01:00 + + + + 0.00 + + + + electricity_consumed + Wh + 2023-12-22T16:15:00+01:00 + 2023-12-22T16:00:00+01:00 + PT15M + + + 3.00 + + + + relay + + 2023-12-22T16:29:30.555+01:00 + 2023-12-22T16:29:30.555+01:00 + + + + on + + electricity_produced + Wh + 2023-12-22T16:15:00+01:00 + 2023-12-22T16:00:00+01:00 + PT15M + + + 0.00 + + - - - 2021-12-31T12:55:52.153+01:00 - temperature_offset - 0.1 - - - 2022-01-11T08:04:34.410+01:00 - thermostat - 15 - 7 - 30 - 0.01 - - - + + 2023-12-22T16:29:30.555+01:00 + true + on + + - - Lisa Badkamer - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2021-12-16T19:31:01.653+01:00 - 2022-01-11T08:04:16.388+01:00 + + OpenThermGateway + An OpenTherm Gateway + open_therm_gateway + 2021-12-16T19:30:28.533+01:00 + 2023-12-17T18:34:07.141+01:00 - - - temperature - C - 2022-01-11T08:03:43.563+01:00 - 2022-01-11T08:03:43.563+01:00 - PT3H - - - 17.90 - - - - temperature_offset - C - 2021-12-28T07:04:31.983+01:00 - 2021-12-16T19:31:13.521+01:00 - - - - 0.00 - - - - battery + + override_mode - 2022-01-10T23:12:31.439+01:00 - 2022-01-09T11:33:13.859+01:00 + 2023-12-17T18:34:07.138+01:00 + 2023-12-17T18:34:07.138+01:00 - - - 0.56 + + + on - - thermostat - C - 2022-01-11T08:04:16.384+01:00 - 2022-01-11T08:04:16.281+01:00 + + open_therm_power_mode + + 2023-08-17T00:05:59.286+02:00 + 2023-08-17T00:05:59.286+02:00 - - - 15.00 + + + 0 - - - 2022-01-11T08:04:16.384+01:00 - thermostat - 15 - 0 - 99.9 - 0.01 - - - - - - 2021-12-28T07:04:31.983+01:00 - temperature_offset - 0 - - + Gateway Container for variables logged about the Gateway in general. gateway 2021-12-16T19:30:16.149+01:00 - 2022-01-11T08:01:02.731+01:00 + 2023-12-22T16:27:33.624+01:00 signal_strength dBm - 2022-01-11T08:01:02.688+01:00 - 2022-01-11T08:01:02.688+01:00 + 2023-12-22T16:26:50.907+01:00 + 2023-12-22T16:26:50.907+01:00 - - -64.00 + + -62.00 link_quality - 2022-01-11T08:01:02.688+01:00 - 2022-01-11T08:01:02.688+01:00 + 2023-12-22T16:26:50.907+01:00 + 2023-12-22T16:26:50.907+01:00 - - 46 + + 48 lan_state - 2022-01-11T08:00:15.817+01:00 - 2021-12-16T19:30:29.391+01:00 + 2023-12-22T16:27:33.603+01:00 + 2023-12-22T16:27:33.603+01:00 - - down + + down wlan_state - 2022-01-11T08:01:02.689+01:00 - 2021-12-28T07:23:44.521+01:00 + 2023-12-22T16:26:50.908+01:00 + 2023-12-22T16:26:50.908+01:00 - - up + + up regulation_mode - 2021-12-16T19:30:16.802+01:00 - + 2023-12-10T11:40:02.539+01:00 + 2023-07-28T20:28:08.585+02:00 - - heating + + heating lan_ip_address - 2022-01-11T08:00:15.817+01:00 - 2021-12-16T19:30:29+01:00 + 2023-12-22T16:27:33+01:00 + 2023-12-22T16:27:33+01:00 - - 0.0.0.0 + + 0.0.0.0 gateway_mode - + 2023-12-02T11:35:46.017+01:00 + + full + wlan_ip_address - 2022-01-11T08:01:02.689+01:00 - 2021-12-28T07:23:44+01:00 + 2023-12-22T16:26:50+01:00 + 2023-12-22T16:26:50+01:00 - - 127.0.0.1 + + 127.0.0.1 - 2021-12-16T19:30:16.802+01:00 + 2023-12-10T11:40:02.539+01:00 regulation_mode heating - heating - off - bleeding_cold bleeding_hot + bleeding_cold + off + heating - + 2023-12-02T11:35:46.017+01:00 gateway_mode full + full + setup light + secure away vacation - - full - secure - - Central heating boiler - - heater_central - 2021-12-16T19:30:21.331+01:00 - 2022-01-11T08:04:53.955+01:00 - - - - - central_heater_water_pressure - bar - 2021-12-18T01:06:46.593+01:00 - 2021-12-16T19:30:25.237+01:00 - - - - 6.00 - - - - domestic_hot_water_burner_operation_time - hr - 2021-12-27T08:32:12+01:00 - 2021-12-27T08:32:12+01:00 - - - - 860 - - - - maximum_boiler_temperature - C - 2021-12-28T05:55:18.023+01:00 - 2021-12-28T05:55:18.023+01:00 - - - - 60.00 - - - - cooling_state - - 2021-12-28T05:55:19.664+01:00 - 2021-12-26T01:13:18.218+01:00 - - - - off - - - - central_heating_state - - 2022-01-11T07:49:39.402+01:00 - 2022-01-11T07:49:39.402+01:00 - - - - on - - - - intended_central_heating_state - - 2022-01-11T06:22:39.373+01:00 - 2022-01-11T06:22:39.373+01:00 - - - - on - - - - failed_burner_flame_ignitions - - 2021-12-17T19:07:38+01:00 - 2021-12-17T19:07:38+01:00 - - - - 30 - - - - burner_starts - - 2022-01-11T08:02:26+01:00 - 2022-01-11T08:02:26+01:00 - - - - 35388 - - - - domestic_hot_water_state - - 2022-01-11T07:49:39.411+01:00 - 2022-01-11T07:49:39.411+01:00 - - - - off - - - - boiler_temperature - C - 2022-01-11T08:04:53.939+01:00 - 2022-01-11T08:04:53.939+01:00 - PT1H - - - 37.00 - - - - intended_boiler_temperature - C - 2022-01-11T08:04:14.147+01:00 - 2022-01-11T08:04:14.146+01:00 - - - - 38.09 - - - - open_therm_oem_fault_code - - 2022-01-11T01:04:31.102+01:00 - 2021-12-16T19:30:24.837+01:00 - - - - 255 - - - - burner_operation_time - s - 2022-01-11T08:00:00+01:00 - 2022-01-11T07:00:00+01:00 - PT1H - - - 14 - - - - burner_operation_time - hr - 2022-01-11T07:45:59+01:00 - 2022-01-11T07:45:59+01:00 - - - - 9588 - - - - domestic_hot_water_comfort_mode - - 2021-12-28T05:55:19.669+01:00 - 2021-12-16T19:36:15.420+01:00 - - - - off - - - - flame_state - - 2022-01-11T08:04:15.362+01:00 - 2022-01-11T08:04:15.362+01:00 - - - - off - - - - failed_burner_starts - - 2021-12-17T19:07:02+01:00 - 2021-12-17T19:07:02+01:00 - - - - 3 - - - - open_therm_application_specific_fault_code - - 2022-01-11T01:04:31.102+01:00 - 2021-12-18T10:33:33.694+01:00 - - - - 0 - - - - - - - 2021-12-28T05:55:19.669+01:00 - domestic_hot_water_comfort_mode - off - - - 2021-12-28T05:55:18.024+01:00 - maximum_boiler_temperature - 60 - 25 - 95 - 0.01 - - - - - diff --git a/userdata/adam_plus_anna_new/core.domain_objects.xml b/userdata/adam_plus_anna_new/core.domain_objects.xml index 90cfd6cb9..641155d6f 100644 --- a/userdata/adam_plus_anna_new/core.domain_objects.xml +++ b/userdata/adam_plus_anna_new/core.domain_objects.xml @@ -1,139 +1,288 @@ - + + Lisa Badkamer + A zone thermostat regulates the temperature in a heating zone (generally a room). + zone_thermostat + 2021-12-16T19:31:01.653+01:00 + 2023-12-22T16:18:09.841+01:00 + + + + + + temperature + C + 2023-12-22T16:18:09.838+01:00 + 2023-12-22T16:18:09.838+01:00 + PT3H + + + 16.50 + + + + temperature_offset + C + 2023-12-10T15:48:43.424+01:00 + 2023-12-10T15:48:43.424+01:00 + + + + 0.00 + + + + battery + + 2023-12-22T13:59:02.810+01:00 + 2023-12-22T13:59:02.810+01:00 + + + + 0.38 + + + + thermostat + C + 2023-12-22T07:00:05.510+01:00 + 2023-12-22T07:00:05.510+01:00 + + + + 18.00 + + + + + + 2023-12-22T07:00:05.511+01:00 + thermostat + 0 + 99.9 + 0.01 + 18 + + + + + + 2023-12-10T15:48:43.425+01:00 + temperature_offset + 0 + + + + + 2021-12-16T19:30:15.976+01:00 + 2023-12-22T16:30:02.561+01:00 + + + + + + + + + economy + on + small + underfloor + false + + + + + + Plugwise - 106-03 - 1 - 2020-11-04T01:00:00+01:00 - - 2021-12-16T19:32:13.013+01:00 - 2021-12-16T19:34:42.991+01:00 + Adam + 6539-1601-4502 + 2018-10-30T10:12:41+01:00 + 2021-12-16T19:30:19.722+01:00 + 2021-12-16T19:30:39.051+01:00 - - - - - - - - - - - - - - - - - - - - - + + + + + + - - ABCD012345670A01 - end_device - true - battery - false - false - - 0 - - - - false - + + 16-50-001-505 + + + - + Plug Werkplek A smart plug that can be switched on/off and measure power usage. computer_desktop - 2021-12-16T19:30:45.677+01:00 - 2022-01-11T08:05:40.167+01:00 + 2021-12-16T19:30:42.936+01:00 + 2023-12-22T16:30:49.607+01:00 - + - - electricity_consumed - W - 2022-01-11T08:05:40.164+01:00 - 2022-01-11T08:05:40.164+01:00 - - - - 98.19 + + electricity_produced + Wh + 2023-12-22T16:15:00+01:00 + 2023-12-22T16:00:00+01:00 + PT15M + + + 0.00 - - + + electricity_produced W - 2022-01-11T08:05:40.165+01:00 - 2021-12-18T10:33:01.826+01:00 + 2023-12-22T16:30:49.581+01:00 + 2023-12-22T16:30:49.581+01:00 - - - 0.00 + + + 0.00 - - electricity_consumed - Wh - 2022-01-11T08:00:00+01:00 - 2022-01-11T07:45:00+01:00 - PT15M - - - 24.00 - - - + relay - 2022-01-11T08:02:24.183+01:00 - 2021-12-16T19:30:48.124+01:00 + 2023-12-22T16:24:29.783+01:00 + 2023-12-22T16:24:29.783+01:00 - - - on + + + on - - electricity_produced + + electricity_consumed Wh - 2022-01-11T08:00:00+01:00 - 2022-01-11T07:45:00+01:00 + 2023-12-22T16:15:00+01:00 + 2023-12-22T16:00:00+01:00 PT15M - - - 0.00 + + + 23.00 + + electricity_consumed + W + 2023-12-22T16:30:49.581+01:00 + 2023-12-22T16:30:49.581+01:00 + + + + 91.31 + + - - 2022-01-11T08:02:24.183+01:00 - true + + 2023-12-22T16:24:29.783+01:00 + false on - + + + Badkamer + +