From d7c1854c6083481f8e977b6a395aa6b25578d085 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 31 Dec 2023 13:46:52 +0100 Subject: [PATCH 001/306] Remove legacy-related testcases --- tests/test_anna.py | 109 ----------------------------------------- tests/test_p1.py | 59 ---------------------- tests/test_stretch.py | 111 ------------------------------------------ 3 files changed, 279 deletions(-) delete mode 100644 tests/test_stretch.py diff --git a/tests/test_anna.py b/tests/test_anna.py index c13a53880..82fbba090 100644 --- a/tests/test_anna.py +++ b/tests/test_anna.py @@ -12,115 +12,6 @@ class TestPlugwiseAnna(TestPlugwise): # pylint: disable=attribute-defined-outside-init """Tests for Anna standalone, i.e. not combined with Adam.""" - @pytest.mark.asyncio - async def test_connect_legacy_anna(self): - """Test a legacy Anna device.""" - self.smile_setup = "legacy_anna" - testdata = self.load_testdata(SMILE_TYPE, self.smile_setup) - - server, smile, client = await self.connect_wrapper() - assert smile.smile_hostname == "smile000000" - - self.validate_test_basics( - _LOGGER, - smile, - smile_version="1.8.22", - smile_legacy=True, - ) - - await self.device_test(smile, "2020-03-22 00:00:01", testdata) - assert smile.gateway_id == "0000aaaa0000aaaa0000aaaa0000aa00" - assert ( - smile._last_active["0000aaaa0000aaaa0000aaaa0000aa00"] - == THERMOSTAT_SCHEDULE - ) - assert smile.device_items == 44 - assert not self.notifications - - result = await self.tinker_thermostat( - smile, - "0000aaaa0000aaaa0000aaaa0000aa00", - good_schedules=[ - THERMOSTAT_SCHEDULE, - ], - ) - assert result - await smile.close_connection() - await self.disconnect(server, client) - - server, smile, client = await self.connect_wrapper(raise_timeout=True) - await self.device_test(smile, "2020-03-22 00:00:01", testdata) - result = await self.tinker_thermostat( - smile, - "0000aaaa0000aaaa0000aaaa0000aa00", - good_schedules=[ - THERMOSTAT_SCHEDULE, - ], - unhappy=True, - ) - assert result - await smile.close_connection() - await self.disconnect(server, client) - - @pytest.mark.asyncio - async def test_connect_legacy_anna_2(self): - """Test another legacy Anna device.""" - self.smile_setup = "legacy_anna_2" - - testdata = self.load_testdata(SMILE_TYPE, self.smile_setup) - # LEFT: figure out why None becomes str instead of nonetype on this particular one - # i.e. in JSON `9e7377867dc24e51b8098a5ba02bd89d`:select_schedule is now 'None' not null - server, smile, client = await self.connect_wrapper() - assert smile.smile_hostname == "smile000000" - - self.validate_test_basics( - _LOGGER, - smile, - smile_version="1.8.22", - smile_legacy=True, - ) - - await self.device_test(smile, "2020-05-03 00:00:01", testdata) - - assert smile.gateway_id == "be81e3f8275b4129852c4d8d550ae2eb" - assert ( - smile._last_active["be81e3f8275b4129852c4d8d550ae2eb"] - == THERMOSTAT_SCHEDULE - ) - assert smile.device_items == 44 - assert not self.notifications - - result = await self.tinker_thermostat( - smile, - "be81e3f8275b4129852c4d8d550ae2eb", - good_schedules=[ - THERMOSTAT_SCHEDULE, - ], - ) - assert result - - smile._schedule_old_states["be81e3f8275b4129852c4d8d550ae2eb"][ - THERMOSTAT_SCHEDULE - ] = "off" - result_1 = await self.tinker_thermostat_schedule( - smile, - "be81e3f8275b4129852c4d8d550ae2eb", - "on", - good_schedules=[THERMOSTAT_SCHEDULE], - single=True, - ) - result_2 = await self.tinker_thermostat_schedule( - smile, - "be81e3f8275b4129852c4d8d550ae2eb", - "on", - good_schedules=[THERMOSTAT_SCHEDULE], - single=True, - ) - assert result_1 and result_2 - - await smile.close_connection() - await self.disconnect(server, client) - @pytest.mark.asyncio async def test_connect_anna_v4(self): """Test an Anna firmware 4 setup.""" diff --git a/tests/test_p1.py b/tests/test_p1.py index d438720e8..e3b9504ae 100644 --- a/tests/test_p1.py +++ b/tests/test_p1.py @@ -10,65 +10,6 @@ class TestPlugwiseP1(TestPlugwise): # pylint: disable=attribute-defined-outside-init """Tests for P1.""" - @pytest.mark.asyncio - async def test_connect_smile_p1_v2(self): - """Test a legacy P1 device.""" - self.smile_setup = "smile_p1_v2" - - testdata = self.load_testdata(SMILE_TYPE, self.smile_setup) - server, smile, client = await self.connect_wrapper() - assert smile.smile_hostname == "smile000000" - - self.validate_test_basics( - _LOGGER, - smile, - smile_type="power", - smile_version="2.5.9", - smile_legacy=True, - ) - - await self.device_test(smile, "2022-05-16 00:00:01", testdata) - assert smile.gateway_id == "aaaa0000aaaa0000aaaa0000aaaa00aa" - assert smile.device_items == 26 - assert not self.notifications - - await smile.close_connection() - await self.disconnect(server, client) - - @pytest.mark.asyncio - async def test_connect_smile_p1_v2_2(self): - """Test another legacy P1 device.""" - self.smile_setup = "smile_p1_v2_2" - - testdata = self.load_testdata(SMILE_TYPE, self.smile_setup) - server, smile, client = await self.connect_wrapper() - assert smile.smile_hostname == "smile000000" - - self.validate_test_basics( - _LOGGER, - smile, - smile_type="power", - smile_version="2.5.9", - smile_legacy=True, - ) - - await self.device_test(smile, "2022-05-16 00:00:01", testdata) - assert smile.device_items == 26 - assert not self.notifications - - # Now change some data and change directory reading xml from - # emulating reading newer dataset after an update_interval - testdata_updated = self.load_testdata( - SMILE_TYPE, f"{self.smile_setup}_UPDATED_DATA" - ) - self.smile_setup = "updated/smile_p1_v2_2" - await self.device_test( - smile, "2022-05-16 00:00:01", testdata_updated, initialize=False - ) - - await smile.close_connection() - await self.disconnect(server, client) - @pytest.mark.asyncio async def test_connect_p1v4(self): """Test a P1 firmware 4 setup.""" diff --git a/tests/test_stretch.py b/tests/test_stretch.py deleted file mode 100644 index aef3bc95c..000000000 --- a/tests/test_stretch.py +++ /dev/null @@ -1,111 +0,0 @@ -"""Test Plugwise module Stretch related functionality.""" - -import pytest - -from .test_init import _LOGGER, TestPlugwise - -SMILE_TYPE = "stretch" - - -class TestPlugwiseStretch( - TestPlugwise -): # pylint: disable=attribute-defined-outside-init - """Tests for Stretch.""" - - @pytest.mark.asyncio - async def test_connect_stretch_v31(self): - """Test a legacy Stretch with firmware 3.1 setup.""" - self.smile_setup = "stretch_v31" - - testdata = self.load_testdata(SMILE_TYPE, self.smile_setup) - server, smile, client = await self.connect_wrapper(stretch=True) - assert smile.smile_hostname == "stretch000000" - - self.validate_test_basics( - _LOGGER, - smile, - smile_type="stretch", - smile_version="3.1.11", - smile_legacy=True, - ) - - await self.device_test(smile, "2022-05-16 00:00:01", testdata) - assert smile.gateway_id == "0000aaaa0000aaaa0000aaaa0000aa00" - assert smile.device_items == 83 - - # Now change some data and change directory reading xml from - # emulating reading newer dataset after an update_interval - testdata_updated = self.load_testdata( - SMILE_TYPE, f"{self.smile_setup}_UPDATED_DATA" - ) - self.smile_setup = "updated/stretch_v31" - await self.device_test( - smile, "2022-05-16 00:00:01", testdata_updated, initialize=False - ) - - await smile.close_connection() - await self.disconnect(server, client) - - @pytest.mark.asyncio - async def test_connect_stretch_v23(self): - """Test a legacy Stretch with firmware 2.3 setup.""" - self.smile_setup = "stretch_v23" - - testdata = self.load_testdata(SMILE_TYPE, self.smile_setup) - server, smile, client = await self.connect_wrapper(stretch=True) - assert smile.smile_hostname == "stretch000000" - - self.validate_test_basics( - _LOGGER, - smile, - smile_type="stretch", - smile_version="2.3.12", - smile_legacy=True, - ) - - await self.device_test(smile, "2022-05-16 00:00:01", testdata) - assert smile.device_items == 229 - - switch_change = await self.tinker_switch( - smile, "2587a7fcdd7e482dab03fda256076b4b" - ) - assert switch_change - switch_change = await self.tinker_switch( - smile, - "f7b145c8492f4dd7a4de760456fdef3e", - ["407aa1c1099d463c9137a3a9eda787fd"], - ) - assert switch_change - - await smile.close_connection() - await self.disconnect(server, client) - - @pytest.mark.asyncio - async def test_connect_stretch_v27_no_domain(self): - """Test a legacy Stretch with firmware 2.7 setup, with no domain_objects.""" - # testdata dictionary with key ctrl_id_dev_id => keys:values - self.smile_setup = "stretch_v27_no_domain" - - testdata = self.load_testdata(SMILE_TYPE, self.smile_setup) - server, smile, client = await self.connect_wrapper(stretch=True) - assert smile.smile_hostname == "stretch000000" - - self.validate_test_basics( - _LOGGER, - smile, - smile_type="stretch", - smile_version="2.7.18", - smile_legacy=True, - ) - - await self.device_test(smile, "2022-05-16 00:00:01", testdata) - assert smile.device_items == 190 - _LOGGER.info(" # Assert no master thermostat") - - switch_change = await self.tinker_switch( - smile, "8b8d14b242e24cd789743c828b9a2ea9" - ) - assert switch_change - - await smile.close_connection() - await self.disconnect(server, client) From c2831324c7131bcd1c7ae2034e5701087d09b058 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 31 Dec 2023 13:48:12 +0100 Subject: [PATCH 002/306] Remove generic legacy-connected test --- tests/test_generic.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tests/test_generic.py b/tests/test_generic.py index dcc00aa82..f5b861b68 100644 --- a/tests/test_generic.py +++ b/tests/test_generic.py @@ -14,17 +14,6 @@ class TestPlugwiseGeneric( ): # pylint: disable=attribute-defined-outside-init """Tests for generic functionality.""" - @pytest.mark.asyncio - async def test_fail_legacy_system(self): - """Test erroneous legacy stretch system.""" - self.smile_setup = "faulty_stretch" - try: - _server, _smile, _client = await self.connect_wrapper() - setup_result = False # pragma: no cover - except pw_exceptions.InvalidXMLError: - setup_result = True - assert setup_result - @pytest.mark.asyncio async def test_fail_anna_connected_to_adam(self): """Test erroneous adam with anna system.""" From d8850230971b6b7940f48ec01cbae6210b4b8caf Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 31 Dec 2023 14:13:00 +0100 Subject: [PATCH 003/306] Disable legacy-related code in helper.py --- plugwise/helper.py | 422 ++++++++++++++++++++++----------------------- 1 file changed, 211 insertions(+), 211 deletions(-) diff --git a/plugwise/helper.py b/plugwise/helper.py index 7f19deb3a..4bb3f98b9 100644 --- a/plugwise/helper.py +++ b/plugwise/helper.py @@ -23,7 +23,7 @@ ACTUATOR_CLASSES, ADAM, ANNA, - APPLIANCES, +# APPLIANCES, ATTR_NAME, ATTR_UNIT_OF_MEASUREMENT, BINARY_SENSORS, @@ -32,8 +32,8 @@ DHW_SETPOINT, ENERGY_KILO_WATT_HOUR, ENERGY_WATT_HOUR, - FAKE_APPL, - FAKE_LOC, +# FAKE_APPL, +# FAKE_LOC, HEATER_CENTRAL_MEASUREMENTS, LIMITS, LOCATIONS, @@ -41,7 +41,7 @@ NONE, OBSOLETE_MEASUREMENTS, OFF, - P1_LEGACY_MEASUREMENTS, +# P1_LEGACY_MEASUREMENTS, P1_MEASUREMENTS, POWER_WATT, SENSORS, @@ -84,13 +84,13 @@ def check_model(name: str | None, vendor_name: str | None) -> str | None: return name -def etree_to_dict(element: etree) -> dict[str, str]: - """Helper-function translating xml Element to dict.""" - node: dict[str, str] = {} - if element is not None: - node.update(element.items()) - - return node +# def etree_to_dict(element: etree) -> dict[str, str]: +# """Helper-function translating xml Element to dict.""" +# node: dict[str, str] = {} +# if element is not None: +# node.update(element.items()) +# +# return node def power_data_local_format( @@ -148,9 +148,9 @@ async def _request_validate(self, resp: ClientResponse, method: str) -> etree: # Command accepted gives empty body with status 202 if resp.status == 202: return - # Cornercase for stretch not responding with 202 - if method == "put" and resp.status == 200: - return +# # Cornercase for stretch not responding with 202 +# if method == "put" and resp.status == 200: +# return if resp.status == 401: msg = "Invalid Plugwise login, please retry with the correct credentials." @@ -187,8 +187,8 @@ async def _request( if method == "delete": resp = await self._websession.delete(url, auth=self._auth) if method == "get": - # Work-around for Stretchv2, should not hurt the other smiles - use_headers = {"Accept-Encoding": "gzip"} +# # Work-around for Stretchv2, should not hurt the other smiles +# use_headers = {"Accept-Encoding": "gzip"} resp = await self._websession.get( url, headers=use_headers, auth=self._auth ) @@ -293,30 +293,30 @@ def _all_locations(self) -> None: loc = Munch() locations = self._locations.findall("./location") - # Legacy Anna without outdoor_temp and Stretches have no locations, create fake location-data - if not locations and self._smile_legacy: - self._home_location = FAKE_LOC - self._loc_data[FAKE_LOC] = {"name": "Home"} - return +# # Legacy Anna without outdoor_temp and Stretches have no locations, create fake location-data +# if not locations and self._smile_legacy: +# self._home_location = FAKE_LOC +# self._loc_data[FAKE_LOC] = {"name": "Home"} +# return for location in locations: loc.name = location.find("name").text loc.loc_id = location.attrib["id"] - # Filter the valid single location for P1 legacy: services not empty - locator = "./services" - if ( - self._smile_legacy - and self.smile_type == "power" - and len(location.find(locator)) == 0 - ): - continue +# # Filter the valid single location for P1 legacy: services not empty +# locator = "./services" +# if ( +# self._smile_legacy +# and self.smile_type == "power" +# and len(location.find(locator)) == 0 +# ): +# continue if loc.name == "Home": self._home_location = loc.loc_id - # Replace location-name for P1 legacy, can contain privacy-related info - if self._smile_legacy and self.smile_type == "power": - loc.name = "Home" - self._home_location = loc.loc_id +# # Replace location-name for P1 legacy, can contain privacy-related info +# if self._smile_legacy and self.smile_type == "power": +# loc.name = "Home" +# self._home_location = loc.loc_id self._loc_data[loc.loc_id] = {"name": loc.name} @@ -354,12 +354,12 @@ def _get_module_data( if (zb_node := module.find("./protocols/zig_bee_node")) is not None: model_data["zigbee_mac_address"] = zb_node.find("mac_address").text model_data["reachable"] = zb_node.find("reachable").text == "true" - # Stretches - if (router := module.find("./protocols/network_router")) is not None: - model_data["zigbee_mac_address"] = router.find("mac_address").text - # Also look for the Circle+/Stealth M+ - if (coord := module.find("./protocols/network_coordinator")) is not None: - model_data["zigbee_mac_address"] = coord.find("mac_address").text +# # Stretches +# if (router := module.find("./protocols/network_router")) is not None: +# model_data["zigbee_mac_address"] = router.find("mac_address").text +# # Also look for the Circle+/Stealth M+ +# if (coord := module.find("./protocols/network_coordinator")) is not None: +# model_data["zigbee_mac_address"] = coord.find("mac_address").text return model_data @@ -375,7 +375,7 @@ def _energy_device_info_finder(self, appliance: etree, appl: Munch) -> Munch: mod_type = "electricity_point_meter" module_data = self._get_module_data(appliance, locator, mod_type) - # Filter appliance without zigbee_mac, it's an orphaned device + # Filter appliance without zigbee_mac, it's an orphaned device - BOUWEW only Stretch-related? appl.zigbee_mac = module_data["zigbee_mac_address"] if appl.zigbee_mac is None and self.smile_type != "power": return None @@ -383,7 +383,7 @@ def _energy_device_info_finder(self, appliance: etree, appl: Munch) -> Munch: appl.hardware = module_data["hardware_version"] appl.model = module_data["vendor_model"] appl.vendor_name = module_data["vendor_name"] - if appl.hardware is not None: + if appl.hardware is not None: # BOUWEW only Stretch-related? hw_version = appl.hardware.replace("-", "") appl.model = version_to_model(hw_version) appl.firmware = module_data["firmware_version"] @@ -542,8 +542,8 @@ def _p1_smartmeter_info_finder(self, appl: Munch) -> None: loc_id = next(iter(self._loc_data.keys())) appl.dev_id = self.gateway_id appl.location = loc_id - if self._smile_legacy: - appl.dev_id = loc_id +# if self._smile_legacy: +# appl.dev_id = loc_id appl.mac = None appl.model = self.smile_model appl.name = "P1" @@ -570,44 +570,44 @@ def _p1_smartmeter_info_finder(self, appl: Munch) -> None: self.gw_devices[appl.dev_id][p1_key] = value self._count += 1 - def _create_legacy_gateway(self) -> None: - """Create the (missing) gateway devices for legacy Anna, P1 and Stretch. - - Use the home_location or FAKE_APPL as device id. - """ - self.gateway_id = self._home_location - if self.smile_type == "power": - self.gateway_id = FAKE_APPL - - self.gw_devices[self.gateway_id] = {"dev_class": "gateway"} - self._count += 1 - for key, value in { - "firmware": self.smile_fw_version, - "location": self._home_location, - "mac_address": self.smile_mac_address, - "model": self.smile_model, - "name": self.smile_name, - "zigbee_mac_address": self.smile_zigbee_mac_address, - "vendor": "Plugwise", - }.items(): - if value is not None: - gw_key = cast(ApplianceType, key) - self.gw_devices[self.gateway_id][gw_key] = value - self._count += 1 +# def _create_legacy_gateway(self) -> None: +# """Create the (missing) gateway devices for legacy Anna, P1 and Stretch. +# +# Use the home_location or FAKE_APPL as device id. +# """ +# self.gateway_id = self._home_location +# if self.smile_type == "power": +# self.gateway_id = FAKE_APPL +# +# self.gw_devices[self.gateway_id] = {"dev_class": "gateway"} +# self._count += 1 +# for key, value in { +# "firmware": self.smile_fw_version, +# "location": self._home_location, +# "mac_address": self.smile_mac_address, +# "model": self.smile_model, +# "name": self.smile_name, +# "zigbee_mac_address": self.smile_zigbee_mac_address, +# "vendor": "Plugwise", +# }.items(): +# if value is not None: +# gw_key = cast(ApplianceType, key) +# self.gw_devices[self.gateway_id][gw_key] = value +# self._count += 1 def _all_appliances(self) -> None: """Collect all appliances with relevant info.""" self._count = 0 self._all_locations() - if self._smile_legacy: - self._create_legacy_gateway() - # For legacy P1 collect the connected SmartMeter info - if self.smile_type == "power": - appl = Munch() - self._p1_smartmeter_info_finder(appl) - # Legacy P1 has no more devices - return +# if self._smile_legacy: +# self._create_legacy_gateway() +# # For legacy P1 collect the connected SmartMeter info +# if self.smile_type == "power": +# appl = Munch() +# self._p1_smartmeter_info_finder(appl) +# # Legacy P1 has no more devices +# return for appliance in self._appliances.findall("./appliance"): appl = Munch() @@ -728,18 +728,18 @@ def _control_state(self, loc_id: str) -> str | bool: return False - def _presets_legacy(self) -> dict[str, list[float]]: - """Helper-function for presets() - collect Presets for a legacy Anna.""" - presets: dict[str, list[float]] = {} - for directive in self._domain_objects.findall("rule/directives/when/then"): - if directive is not None and directive.get("icon") is not None: - # Ensure list of heating_setpoint, cooling_setpoint - presets[directive.attrib["icon"]] = [ - float(directive.attrib["temperature"]), - 0, - ] - - return presets +# def _presets_legacy(self) -> dict[str, list[float]]: +# """Helper-function for presets() - collect Presets for a legacy Anna.""" +# presets: dict[str, list[float]] = {} +# for directive in self._domain_objects.findall("rule/directives/when/then"): +# if directive is not None and directive.get("icon") is not None: +# # Ensure list of heating_setpoint, cooling_setpoint +# presets[directive.attrib["icon"]] = [ +# float(directive.attrib["temperature"]), +# 0, +# ] +# +# return presets def _presets(self, loc_id: str) -> dict[str, list[float]]: """Collect Presets for a Thermostat based on location_id.""" @@ -747,8 +747,8 @@ def _presets(self, loc_id: str) -> dict[str, list[float]]: tag_1 = "zone_setpoint_and_state_based_on_preset" tag_2 = "Thermostat presets" - if self._smile_legacy: - return self._presets_legacy() +# if self._smile_legacy: +# return self._presets_legacy() if not (rule_ids := self._rule_ids_by_tag(tag_1, loc_id)): if not (rule_ids := self._rule_ids_by_name(tag_2, loc_id)): @@ -812,8 +812,8 @@ def _appliance_measurements( for measurement, attrs in measurements.items(): p_locator = f'.//logs/point_log[type="{measurement}"]/period/measurement' if (appl_p_loc := appliance.find(p_locator)) is not None: - if self._smile_legacy and measurement == "domestic_hot_water_state": - continue +# if self._smile_legacy and measurement == "domestic_hot_water_state": +# continue # Skip known obsolete measurements updated_date_locator = ( @@ -932,9 +932,9 @@ def _get_actuator_functionalities( functionality = "thermostat_functionality" if item == "temperature_offset": functionality = "offset_functionality" - # Don't support temperature_offset for legacy Anna - if self._smile_legacy: - continue +# # Don't support temperature_offset for legacy Anna +# if self._smile_legacy: +# continue # When there is no updated_date-text, skip the actuator updated_date_location = f'.//actuator_functionalities/{functionality}[type="{item}"]/updated_date' @@ -1056,10 +1056,10 @@ def _get_measurement_data(self, dev_id: str) -> DeviceData: # !! DON'T CHANGE below two if-lines, will break stuff !! if self.smile_type == "power": if device["dev_class"] == "smartmeter": - if not self._smile_legacy: - data.update(self._power_data_from_location(device["location"])) - else: - data.update(self._power_data_from_modules()) +# if not self._smile_legacy: + data.update(self._power_data_from_location(device["location"])) +# else: +# data.update(self._power_data_from_modules()) return data @@ -1193,23 +1193,23 @@ def _scan_thermostats(self) -> None: if "slaves" in tl_loc_id and dev_id in tl_loc_id["slaves"]: device["dev_class"] = "thermo_sensor" - def _thermostat_uri_legacy(self) -> str: - """Helper-function for _thermostat_uri(). - - Determine the location-set_temperature uri - from APPLIANCES. - """ - locator = "./appliance[type='thermostat']" - appliance_id = self._appliances.find(locator).attrib["id"] - - return f"{APPLIANCES};id={appliance_id}/thermostat" +# def _thermostat_uri_legacy(self) -> str: +# """Helper-function for _thermostat_uri(). +# +# Determine the location-set_temperature uri - from APPLIANCES. +# """ +# locator = "./appliance[type='thermostat']" +# appliance_id = self._appliances.find(locator).attrib["id"] +# +# return f"{APPLIANCES};id={appliance_id}/thermostat" def _thermostat_uri(self, loc_id: str) -> str: """Helper-function for smile.py: set_temperature(). Determine the location-set_temperature uri - from LOCATIONS. """ - if self._smile_legacy: - return self._thermostat_uri_legacy() +# if self._smile_legacy: +# return self._thermostat_uri_legacy() locator = f'./location[@id="{loc_id}"]/actuator_functionalities/thermostat_functionality' thermostat_functionality_id = self._locations.find(locator).attrib["id"] @@ -1320,22 +1320,22 @@ def _power_data_peak_value(self, loc: Munch) -> Munch: if loc.logs.find(loc.locator) is None: loc.found = False return loc - # P1 legacy point_meter has no tariff_indicator - elif "meter" in loc.log_type and ( - "point" in loc.log_type or "gas" in loc.measurement - ): - # Avoid double processing by skipping one peak-list option - if loc.peak_select == "nl_offpeak": - loc.found = False - return loc - - loc.locator = ( - f"./{loc.meas_list[0]}_{loc.log_type}/" - f'measurement[@directionality="{loc.meas_list[1]}"]' - ) - if loc.logs.find(loc.locator) is None: - loc.found = False - return loc +# # P1 legacy point_meter has no tariff_indicator +# elif "meter" in loc.log_type and ( +# "point" in loc.log_type or "gas" in loc.measurement +# ): +# # Avoid double processing by skipping one peak-list option +# if loc.peak_select == "nl_offpeak": +# loc.found = False +# return loc +# +# loc.locator = ( +# f"./{loc.meas_list[0]}_{loc.log_type}/" +# f'measurement[@directionality="{loc.meas_list[1]}"]' +# ) +# if loc.logs.find(loc.locator) is None: +# loc.found = False +# return loc else: loc.found = False return loc @@ -1387,92 +1387,92 @@ def _power_data_from_location(self, loc_id: str) -> DeviceData: self._count += len(direct_data["sensors"]) return direct_data - def _power_data_from_modules(self) -> DeviceData: - """Helper-function for smile.py: _get_device_data(). - - Collect the power-data from MODULES (P1 legacy only). - """ - direct_data: DeviceData = {"sensors": {}} - loc = Munch() - mod_list: list[str] = ["interval_meter", "cumulative_meter", "point_meter"] - peak_list: list[str] = ["nl_peak", "nl_offpeak"] - t_string = "tariff_indicator" - - search = self._modules - mod_logs = search.findall("./module/services") - for loc.measurement, loc.attrs in P1_LEGACY_MEASUREMENTS.items(): - loc.meas_list = loc.measurement.split("_") - for loc.logs in mod_logs: - for loc.log_type in mod_list: - for loc.peak_select in peak_list: - loc.locator = ( - f"./{loc.meas_list[0]}_{loc.log_type}/measurement" - f'[@directionality="{loc.meas_list[1]}"][@{t_string}="{loc.peak_select}"]' - ) - loc = self._power_data_peak_value(loc) - if not loc.found: - continue - - direct_data = self.power_data_energy_diff( - loc.measurement, loc.net_string, loc.f_val, direct_data - ) - key = cast(SensorType, loc.key_string) - direct_data["sensors"][key] = loc.f_val - - self._count += len(direct_data["sensors"]) - return direct_data +# def _power_data_from_modules(self) -> DeviceData: +# """Helper-function for smile.py: _get_device_data(). +# +# Collect the power-data from MODULES (P1 legacy only). +# """ +# direct_data: DeviceData = {"sensors": {}} +# loc = Munch() +# mod_list: list[str] = ["interval_meter", "cumulative_meter", "point_meter"] +# peak_list: list[str] = ["nl_peak", "nl_offpeak"] +# t_string = "tariff_indicator" +# +# search = self._modules +# mod_logs = search.findall("./module/services") +# for loc.measurement, loc.attrs in P1_LEGACY_MEASUREMENTS.items(): +# loc.meas_list = loc.measurement.split("_") +# for loc.logs in mod_logs: +# for loc.log_type in mod_list: +# for loc.peak_select in peak_list: +# loc.locator = ( +# f"./{loc.meas_list[0]}_{loc.log_type}/measurement" +# f'[@directionality="{loc.meas_list[1]}"][@{t_string}="{loc.peak_select}"]' +# ) +# loc = self._power_data_peak_value(loc) +# if not loc.found: +# continue +# +# direct_data = self.power_data_energy_diff( +# loc.measurement, loc.net_string, loc.f_val, direct_data +# ) +# key = cast(SensorType, loc.key_string) +# direct_data["sensors"][key] = loc.f_val +# +# self._count += len(direct_data["sensors"]) +# return direct_data def _preset(self, loc_id: str) -> str | None: """Helper-function for smile.py: device_data_climate(). Collect the active preset based on Location ID. """ - if not self._smile_legacy: - locator = f'./location[@id="{loc_id}"]/preset' - if (preset := self._domain_objects.find(locator)) is not None: - return str(preset.text) - return None - - locator = "./rule[active='true']/directives/when/then" - if ( - not (active_rule := etree_to_dict(self._domain_objects.find(locator))) - or "icon" not in active_rule - ): - return None - - return active_rule["icon"] - - def _schedules_legacy( - self, - avail: list[str], - location: str, - sel: str, - ) -> tuple[list[str], str]: - """Helper-function for _schedules(). - - Collect available schedules/schedules for the legacy thermostat. - """ - name: str | None = None - - search = self._domain_objects - for schedule in search.findall("./rule"): - if rule_name := schedule.find("name").text: - if "preset" not in rule_name: - name = rule_name - - log_type = "schedule_state" - locator = f"./appliance[type='thermostat']/logs/point_log[type='{log_type}']/period/measurement" - active = False - if (result := search.find(locator)) is not None: - active = result.text == "on" - - if name is not None: - avail = [name] - if active: - sel = name - - self._last_active[location] = "".join(map(str, avail)) - return avail, sel +# if not self._smile_legacy: + locator = f'./location[@id="{loc_id}"]/preset' + if (preset := self._domain_objects.find(locator)) is not None: + return str(preset.text) + return None + +# locator = "./rule[active='true']/directives/when/then" +# if ( +# not (active_rule := etree_to_dict(self._domain_objects.find(locator))) +# or "icon" not in active_rule +# ): +# return None +# +# return active_rule["icon"] + +# def _schedules_legacy( +# self, +# avail: list[str], +# location: str, +# sel: str, +# ) -> tuple[list[str], str]: +# """Helper-function for _schedules(). +# +# Collect available schedules/schedules for the legacy thermostat. +# """ +# name: str | None = None +# +# search = self._domain_objects +# for schedule in search.findall("./rule"): +# if rule_name := schedule.find("name").text: +# if "preset" not in rule_name: +# name = rule_name +# +# log_type = "schedule_state" +# locator = f"./appliance[type='thermostat']/logs/point_log[type='{log_type}']/period/measurement" +# active = False +# if (result := search.find(locator)) is not None: +# active = result.text == "on" +# +# if name is not None: +# avail = [name] +# if active: +# sel = name +# +# self._last_active[location] = "".join(map(str, avail)) +# return avail, sel def _schedules(self, location: str) -> tuple[list[str], str]: """Helper-function for smile.py: _device_data_climate(). @@ -1484,9 +1484,9 @@ def _schedules(self, location: str) -> tuple[list[str], str]: rule_ids: dict[str, dict[str, str]] = {} selected = NONE - # Legacy Anna schedule, only one schedule allowed - if self._smile_legacy: - return self._schedules_legacy(available, location, selected) +# # Legacy Anna schedule, only one schedule allowed +# if self._smile_legacy: +# return self._schedules_legacy(available, location, selected) # Adam schedules, one schedule can be linked to various locations # self._last_active contains the locations and the active schedule name per location, or None @@ -1557,9 +1557,9 @@ def _get_lock_state(self, xml: etree, data: DeviceData) -> None: """ actuator = "actuator_functionalities" func_type = "relay_functionality" - if self._stretch_v2: - actuator = "actuators" - func_type = "relay" +# if self._stretch_v2: +# actuator = "actuators" +# func_type = "relay" if xml.find("type").text not in SPECIAL_PLUG_TYPES: locator = f"./{actuator}/{func_type}/lock" if (found := xml.find(locator)) is not None: From ca574addcffd55cf7182fd567ea7de6ecb4b62c2 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 31 Dec 2023 14:20:41 +0100 Subject: [PATCH 004/306] Disable legacy-related code in __init__.py --- plugwise/__init__.py | 224 +++++++++++++++++++++---------------------- 1 file changed, 112 insertions(+), 112 deletions(-) diff --git a/plugwise/__init__.py b/plugwise/__init__.py index e1d96e0de..767e8641b 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -362,10 +362,10 @@ def __init__( async def connect(self) -> bool: """Connect to Plugwise device and determine its name, type and version.""" result = await self._request(DOMAIN_OBJECTS) - # Work-around for Stretch fv 2.7.18 - if not (vendor_names := result.findall("./module/vendor_name")): - result = await self._request(MODULES) - vendor_names = result.findall("./module/vendor_name") +# # Work-around for Stretch fv 2.7.18 +# if not (vendor_names := result.findall("./module/vendor_name")): +# result = await self._request(MODULES) + vendor_names = result.findall("./module/vendor_name") names: list[str] = [] for name in vendor_names: @@ -400,52 +400,52 @@ async def connect(self) -> bool: return True - async def _smile_detect_legacy( - self, result: etree, dsmrmain: etree, model: str - ) -> str: - """Helper-function for _smile_detect().""" - return_model = model - # Stretch: find the MAC of the zigbee master_controller (= Stick) - if (network := result.find("./module/protocols/master_controller")) is not None: - self.smile_zigbee_mac_address = network.find("mac_address").text - # Find the active MAC in case there is an orphaned Stick - if zb_networks := result.findall("./network"): - for zb_network in zb_networks: - if zb_network.find("./nodes/network_router") is not None: - network = zb_network.find("./master_controller") - self.smile_zigbee_mac_address = network.find("mac_address").text - - # Legacy Anna or Stretch: - if ( - result.find('./appliance[type="thermostat"]') is not None - or network is not None - ): - self._system = await self._request(SYSTEM) - self.smile_fw_version = self._system.find("./gateway/firmware").text - return_model = self._system.find("./gateway/product").text - self.smile_hostname = self._system.find("./gateway/hostname").text - # If wlan0 contains data it's active, so eth0 should be checked last - for network in ("wlan0", "eth0"): - locator = f"./{network}/mac" - if (net_locator := self._system.find(locator)) is not None: - self.smile_mac_address = net_locator.text - # P1 legacy: - elif dsmrmain is not None: - self._status = await self._request(STATUS) - self.smile_fw_version = self._status.find("./system/version").text - return_model = self._status.find("./system/product").text - self.smile_hostname = self._status.find("./network/hostname").text - self.smile_mac_address = self._status.find("./network/mac_address").text - else: # pragma: no cover - # No cornercase, just end of the line - LOGGER.error( - "Connected but no gateway device information found, please create" - " an issue on http://github.com/plugwise/python-plugwise" - ) - raise ResponseError - - self._smile_legacy = True - return return_model +# async def _smile_detect_legacy( +# self, result: etree, dsmrmain: etree, model: str +# ) -> str: +# """Helper-function for _smile_detect().""" +# return_model = model +# # Stretch: find the MAC of the zigbee master_controller (= Stick) +# if (network := result.find("./module/protocols/master_controller")) is not None: +# self.smile_zigbee_mac_address = network.find("mac_address").text +# # Find the active MAC in case there is an orphaned Stick +# if zb_networks := result.findall("./network"): +# for zb_network in zb_networks: +# if zb_network.find("./nodes/network_router") is not None: +# network = zb_network.find("./master_controller") +# self.smile_zigbee_mac_address = network.find("mac_address").text +# +# # Legacy Anna or Stretch: +# if ( +# result.find('./appliance[type="thermostat"]') is not None +# or network is not None +# ): +# self._system = await self._request(SYSTEM) +# self.smile_fw_version = self._system.find("./gateway/firmware").text +# return_model = self._system.find("./gateway/product").text +# self.smile_hostname = self._system.find("./gateway/hostname").text +# # If wlan0 contains data it's active, so eth0 should be checked last +# for network in ("wlan0", "eth0"): +# locator = f"./{network}/mac" +# if (net_locator := self._system.find(locator)) is not None: +# self.smile_mac_address = net_locator.text +# # P1 legacy: +# elif dsmrmain is not None: +# self._status = await self._request(STATUS) +# self.smile_fw_version = self._status.find("./system/version").text +# return_model = self._status.find("./system/product").text +# self.smile_hostname = self._status.find("./network/hostname").text +# self.smile_mac_address = self._status.find("./network/mac_address").text +# else: # pragma: no cover +# # No cornercase, just end of the line +# LOGGER.error( +# "Connected but no gateway device information found, please create" +# " an issue on http://github.com/plugwise/python-plugwise" +# ) +# raise ResponseError +# +# self._smile_legacy = True +# return return_model async def _smile_detect(self, result: etree, dsmrmain: etree) -> None: """Helper-function for connect(). @@ -460,8 +460,8 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None: self.smile_hw_version = gateway.find("hardware_version").text self.smile_hostname = gateway.find("hostname").text self.smile_mac_address = gateway.find("mac_address").text - else: - model = await self._smile_detect_legacy(result, dsmrmain, model) + # else: + # model = await self._smile_detect_legacy(result, dsmrmain, model) if model == "Unknown" or self.smile_fw_version is None: # pragma: no cover # Corner case check @@ -494,9 +494,9 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None: self.smile_type = SMILES[self._target_smile].smile_type self.smile_version = (self.smile_fw_version, ver) - if self.smile_type == "stretch": - self._stretch_v2 = self.smile_version[1].major == 2 - self._stretch_v3 = self.smile_version[1].major == 3 +# if self.smile_type == "stretch": +# self._stretch_v2 = self.smile_version[1].major == 2 +# self._stretch_v3 = self.smile_version[1].major == 3 if self.smile_type == "thermostat": self._is_thermostat = True @@ -564,14 +564,14 @@ async def async_update(self) -> PlugwiseData: self._domain_objects = await self._request(DOMAIN_OBJECTS) self._get_plugwise_notifications() match self._target_smile: - case "smile_v2": - self._modules = await self._request(MODULES) - case "smile_v3" | "smile_v4": +# case "smile_v2": +# self._modules = await self._request(MODULES) + case "smile_v3" | "smile_v4": # TODO remove v3 self._locations = await self._request(LOCATIONS) - case "smile_open_therm_v2" | "smile_open_therm_v3": + case "smile_open_therm_v2" | "smile_open_therm_v3": # TODO remove v2 self._appliances = await self._request(APPLIANCES) self._modules = await self._request(MODULES) - case self._target_smile if self._target_smile in REQUIRE_APPLIANCES: + case self._target_smile if self._target_smile in REQUIRE_APPLIANCES: # TODO clean up REQUIRE_APPLIANCES self._appliances = await self._request(APPLIANCES) self._update_gw_devices() @@ -580,38 +580,38 @@ async def async_update(self) -> PlugwiseData: self._previous_day_number = day_number return PlugwiseData(self.gw_data, self.gw_devices) - async def _set_schedule_state_legacy( - self, loc_id: str, name: str, status: str - ) -> None: - """Helper-function for set_schedule_state().""" - schedule_rule_id: str | None = None - for rule in self._domain_objects.findall("rule"): - if rule.find("name").text == name: - schedule_rule_id = rule.attrib["id"] - - if schedule_rule_id is None: - raise PlugwiseError("Plugwise: no schedule with this name available.") - - new_state = "false" - if status == "on": - new_state = "true" - # If no state change is requested, do nothing - if new_state == self._schedule_old_states[loc_id][name]: - return - - locator = f'.//*[@id="{schedule_rule_id}"]/template' - for rule in self._domain_objects.findall(locator): - template_id = rule.attrib["id"] - - uri = f"{RULES};id={schedule_rule_id}" - data = ( - "{new_state}' - ) - - await self._request(uri, method="put", data=data) - self._schedule_old_states[loc_id][name] = new_state +# async def _set_schedule_state_legacy( +# self, loc_id: str, name: str, status: str +# ) -> None: +# """Helper-function for set_schedule_state().""" +# schedule_rule_id: str | None = None +# for rule in self._domain_objects.findall("rule"): +# if rule.find("name").text == name: +# schedule_rule_id = rule.attrib["id"] +# +# if schedule_rule_id is None: +# raise PlugwiseError("Plugwise: no schedule with this name available.") +# +# new_state = "false" +# if status == "on": +# new_state = "true" +# # If no state change is requested, do nothing +# if new_state == self._schedule_old_states[loc_id][name]: +# return +# +# locator = f'.//*[@id="{schedule_rule_id}"]/template' +# for rule in self._domain_objects.findall(locator): +# template_id = rule.attrib["id"] +# +# uri = f"{RULES};id={schedule_rule_id}" +# data = ( +# "{new_state}' +# ) +# +# await self._request(uri, method="put", data=data) +# self._schedule_old_states[loc_id][name] = new_state def determine_contexts( self, loc_id: str, name: str, state: str, sched_id: str @@ -659,9 +659,9 @@ async def set_schedule_state( return assert isinstance(name, str) - if self._smile_legacy: - await self._set_schedule_state_legacy(loc_id, name, new_state) - return +# if self._smile_legacy: +# await self._set_schedule_state_legacy(loc_id, name, new_state) +# return schedule_rule = self._rule_ids_by_name(name, loc_id) # Raise an error when the schedule name does not exist @@ -691,13 +691,13 @@ async def set_schedule_state( await self._request(uri, method="put", data=data) self._schedule_old_states[loc_id][name] = new_state - async def _set_preset_legacy(self, preset: str) -> None: - """Set the given Preset on the relevant Thermostat - from DOMAIN_OBJECTS.""" - locator = f'rule/directives/when/then[@icon="{preset}"].../.../...' - rule = self._domain_objects.find(locator) - data = f'true' - - await self._request(RULES, method="put", data=data) +# async def _set_preset_legacy(self, preset: str) -> None: +# """Set the given Preset on the relevant Thermostat - from DOMAIN_OBJECTS.""" +# locator = f'rule/directives/when/then[@icon="{preset}"].../.../...' +# rule = self._domain_objects.find(locator) +# data = f'true' +# +# await self._request(RULES, method="put", data=data) async def set_preset(self, loc_id: str, preset: str) -> None: """Set the given Preset on the relevant Thermostat - from LOCATIONS.""" @@ -706,9 +706,9 @@ async def set_preset(self, loc_id: str, preset: str) -> None: if preset not in list(presets): raise PlugwiseError("Plugwise: invalid preset.") - if self._smile_legacy: - await self._set_preset_legacy(preset) - return +# if self._smile_legacy: +# await self._set_preset_legacy(preset) +# return current_location = self._locations.find(f'location[@id="{loc_id}"]') location_name = current_location.find("name").text @@ -805,8 +805,8 @@ async def _set_groupswitch_member_state( locator = f'appliance[@id="{member}"]/{switch.actuator}/{switch.func_type}' switch_id = self._appliances.find(locator).attrib["id"] uri = f"{APPLIANCES};id={member}/{switch.device};id={switch_id}" - if self._stretch_v2: - uri = f"{APPLIANCES};id={member}/{switch.device}" +# if self._stretch_v2: +# uri = f"{APPLIANCES};id={member}/{switch.device}" data = f"<{switch.func_type}><{switch.func}>{state}" await self._request(uri, method="put", data=data) @@ -834,9 +834,9 @@ async def set_switch_state( switch.func = "lock" state = "false" if state == "off" else "true" - if self._stretch_v2: - switch.actuator = "actuators" - switch.func_type = "relay" +# if self._stretch_v2: +# switch.actuator = "actuators" +# switch.func_type = "relay" if members is not None: return await self._set_groupswitch_member_state(members, state, switch) @@ -852,8 +852,8 @@ async def set_switch_state( break uri = f"{APPLIANCES};id={appl_id}/{switch.device};id={switch_id}" - if self._stretch_v2: - uri = f"{APPLIANCES};id={appl_id}/{switch.device}" +# if self._stretch_v2: +# uri = f"{APPLIANCES};id={appl_id}/{switch.device}" data = f"<{switch.func_type}><{switch.func}>{state}" if model == "relay": From 0e45e803af1c56d42bf4c5cefd3aa26470dd1803 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 31 Dec 2023 14:21:22 +0100 Subject: [PATCH 005/306] Fix --- plugwise/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugwise/__init__.py b/plugwise/__init__.py index 767e8641b..f2fecc058 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -365,7 +365,7 @@ async def connect(self) -> bool: # # Work-around for Stretch fv 2.7.18 # if not (vendor_names := result.findall("./module/vendor_name")): # result = await self._request(MODULES) - vendor_names = result.findall("./module/vendor_name") + vendor_names = result.findall("./module/vendor_name") names: list[str] = [] for name in vendor_names: From c8c7e597c846aaa2014d0c85fe8be8442d8494b2 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 31 Dec 2023 14:22:14 +0100 Subject: [PATCH 006/306] Remove --- plugwise/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugwise/__init__.py b/plugwise/__init__.py index f2fecc058..7cca89010 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -34,9 +34,9 @@ REQUIRE_APPLIANCES, RULES, SMILES, - STATUS, +# STATUS, SWITCH_GROUP_TYPES, - SYSTEM, +# SYSTEM, ZONE_THERMOSTATS, ActuatorData, DeviceData, From e03cbf90ecb705ce39e33d751954b861a376edde Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 31 Dec 2023 14:25:11 +0100 Subject: [PATCH 007/306] More removals/clean-up --- plugwise/__init__.py | 8 ++++---- plugwise/constants.py | 7 ------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/plugwise/__init__.py b/plugwise/__init__.py index 7cca89010..31092c0d5 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -31,7 +31,7 @@ NONE, NOTIFICATIONS, OFF, - REQUIRE_APPLIANCES, +# REQUIRE_APPLIANCES, RULES, SMILES, # STATUS, @@ -566,12 +566,12 @@ async def async_update(self) -> PlugwiseData: match self._target_smile: # case "smile_v2": # self._modules = await self._request(MODULES) - case "smile_v3" | "smile_v4": # TODO remove v3 + case "smile_v4": self._locations = await self._request(LOCATIONS) - case "smile_open_therm_v2" | "smile_open_therm_v3": # TODO remove v2 + case "smile_open_therm_v3": self._appliances = await self._request(APPLIANCES) self._modules = await self._request(MODULES) - case self._target_smile if self._target_smile in REQUIRE_APPLIANCES: # TODO clean up REQUIRE_APPLIANCES + case "smile_thermo_v4": self._appliances = await self._request(APPLIANCES) self._update_gw_devices() diff --git a/plugwise/constants.py b/plugwise/constants.py index 752d2600d..4eaa24218 100644 --- a/plugwise/constants.py +++ b/plugwise/constants.py @@ -204,13 +204,6 @@ "stretch_v2": SMILE(STRETCH, "Stretch"), "stretch_v3": SMILE(STRETCH, "Stretch"), } -REQUIRE_APPLIANCES: Final[list[str]] = [ - "smile_thermo_v1", - "smile_thermo_v3", - "smile_thermo_v4", - "stretch_v2", - "stretch_v3", -] # Class, Literal and related tuple-definitions From f59356a7268ee6a7656e94e1c15f4d4ef5defd7d Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 31 Dec 2023 14:38:45 +0100 Subject: [PATCH 008/306] Clean up various legacy references --- plugwise/helper.py | 49 +++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/plugwise/helper.py b/plugwise/helper.py index 4bb3f98b9..7db0f0d3b 100644 --- a/plugwise/helper.py +++ b/plugwise/helper.py @@ -248,10 +248,10 @@ def __init__(self) -> None: self._outdoor_temp: float self._reg_allowed_modes: list[str] = [] self._schedule_old_states: dict[str, dict[str, str]] = {} - self._smile_legacy = False +# self._smile_legacy = False self._status: etree - self._stretch_v2 = False - self._stretch_v3 = False +# self._stretch_v2 = False +# self._stretch_v3 = False self._system: etree self._thermo_locs: dict[str, ThermoLoc] = {} ################################################################### @@ -368,17 +368,18 @@ def _energy_device_info_finder(self, appliance: etree, appl: Munch) -> Munch: Collect energy device info (Circle, Plug, Stealth): firmware, model and vendor name. """ - if self.smile_type in ("power", "stretch"): - locator = "./services/electricity_point_meter" - if not self._smile_legacy: - locator = "./logs/point_log/electricity_point_meter" +# if self.smile_type in ("power", "stretch"): + if self.smile_type == "power": +# locator = "./services/electricity_point_meter" +# if not self._smile_legacy: + locator = "./logs/point_log/electricity_point_meter" mod_type = "electricity_point_meter" module_data = self._get_module_data(appliance, locator, mod_type) - # Filter appliance without zigbee_mac, it's an orphaned device - BOUWEW only Stretch-related? appl.zigbee_mac = module_data["zigbee_mac_address"] - if appl.zigbee_mac is None and self.smile_type != "power": - return None +# # Filter appliance without zigbee_mac, it's an orphaned device +# if appl.zigbee_mac is None and self.smile_type != "power": +# return None appl.hardware = module_data["hardware_version"] appl.model = module_data["vendor_model"] @@ -622,11 +623,9 @@ def _all_appliances(self) -> None: appl.location = None if (appl_loc := appliance.find("location")) is not None: appl.location = appl_loc.attrib["id"] - # Provide a location for legacy_anna, also don't assign the _home_location - # to thermostat-devices without a location, they are not active - elif ( - self._smile_legacy and self.smile_type == "thermostat" - ) or appl.pwclass not in THERMOSTAT_CLASSES: + # Don't assign the _home_location to thermostat-devices without a location, + # they are not active + elif appl.pwclass not in THERMOSTAT_CLASSES: appl.location = self._home_location appl.dev_id = appliance.attrib["id"] @@ -639,7 +638,7 @@ def _all_appliances(self) -> None: appl.vendor_name = None # Determine class for this appliance - # Skip on heater_central when no active device present or on orphaned stretch devices + # Skip on heater_central when no active device present if not (appl := self._appliance_info_finder(appliance, appl)): continue @@ -652,12 +651,8 @@ def _all_appliances(self) -> None: if appl.pwclass == "gateway" and self.smile_type == "power": appl.dev_id = appl.location - # Don't show orphaned non-legacy thermostat-types or the OpenTherm Gateway. - if ( - not self._smile_legacy - and appl.pwclass in THERMOSTAT_CLASSES - and appl.location is None - ): + # Don't show orphaned thermostat-types or the OpenTherm Gateway. + if appl.pwclass in THERMOSTAT_CLASSES and appl.location is None: continue self.gw_devices[appl.dev_id] = {"dev_class": appl.pwclass} @@ -677,7 +672,7 @@ def _all_appliances(self) -> None: self.gw_devices[appl.dev_id][appl_key] = value self._count += 1 - # For non-legacy P1 collect the connected SmartMeter info + # For P1 collect the connected SmartMeter info if self.smile_type == "power": self._p1_smartmeter_info_finder(appl) # P1: for gateway and smartmeter switch device_id - part 2 @@ -1051,7 +1046,7 @@ def _get_measurement_data(self, dev_id: str) -> DeviceData: Collect the appliance-data based on device id. """ data: DeviceData = {"binary_sensors": {}, "sensors": {}, "switches": {}} - # Get P1 smartmeter data from LOCATIONS or MODULES + # Get P1 smartmeter data from LOCATIONS device = self.gw_devices[dev_id] # !! DON'T CHANGE below two if-lines, will break stuff !! if self.smile_type == "power": @@ -1063,7 +1058,7 @@ def _get_measurement_data(self, dev_id: str) -> DeviceData: return data - # Get non-p1 data from APPLIANCES, for legacy from DOMAIN_OBJECTS. + # Get non-p1 data from APPLIANCES - BOUWEW what does this mean? measurements = DEVICE_MEASUREMENTS if self._is_thermostat and dev_id == self._heater_id: measurements = HEATER_CENTRAL_MEASUREMENTS @@ -1232,8 +1227,8 @@ def _get_group_switches(self) -> dict[str, DeviceData]: group_name = group.find("name").text group_type = group.find("type").text group_appliances = group.findall("appliances/appliance") + # Check if members are not orphaned for item in group_appliances: - # Check if members are not orphaned - stretch if item.attrib["id"] in self.gw_devices: members.append(item.attrib["id"]) @@ -1304,7 +1299,7 @@ def _power_data_peak_value(self, loc: Munch) -> Munch: """Helper-function for _power_data_from_location() and _power_data_from_modules().""" loc.found = True # If locator not found look for P1 gas_consumed or phase data (without tariff) - # or for P1 legacy electricity_point_meter or gas_*_meter data +# # or for P1 legacy electricity_point_meter or gas_*_meter data if loc.logs.find(loc.locator) is None: if "log" in loc.log_type and ( "gas" in loc.measurement or "phase" in loc.measurement From b9130ae590a259dc55075116644dafce08678bfa Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 31 Dec 2023 14:42:21 +0100 Subject: [PATCH 009/306] More clean-up --- plugwise/__init__.py | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/plugwise/__init__.py b/plugwise/__init__.py index 31092c0d5..138adf623 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -84,8 +84,7 @@ def _add_or_update_notifications( if ( device_id == self.gateway_id and ( - self._is_thermostat - or (self.smile_type == "power" and not self._smile_legacy) + self._is_thermostat or self.smile_type == "power" ) ) or ( "binary_sensors" in device @@ -263,8 +262,7 @@ def _get_schedule_states_with_off( ) -> None: """Collect schedules with states for each thermostat. - Also, replace NONE by OFF when none of the schedules are active, - only for non-legacy thermostats. + Also, replace NONE by OFF when none of the schedules are active. """ loc_schedule_states: dict[str, str] = {} for schedule in schedules: @@ -274,12 +272,11 @@ def _get_schedule_states_with_off( self._schedule_old_states[location] = loc_schedule_states all_off = True - if not self._smile_legacy: - for state in self._schedule_old_states[location].values(): - if state == "on": - all_off = False - if all_off: - data["select_schedule"] = OFF + for state in self._schedule_old_states[location].values(): + if state == "on": + all_off = False + if all_off: + data["select_schedule"] = OFF def _check_availability( self, device: DeviceData, dev_class: str, data: DeviceData, message: str @@ -304,17 +301,16 @@ def _get_device_data(self, dev_id: str) -> DeviceData: device = self.gw_devices[dev_id] data = self._get_measurement_data(dev_id) - # Check availability of non-legacy wired-connected devices - if not self._smile_legacy: - # Smartmeter + # Check availability of wired-connected devices + # Smartmeter + self._check_availability( + device, "smartmeter", data, "P1 does not seem to be connected" + ) + # OpenTherm device + if device["name"] != "OnOff": self._check_availability( - device, "smartmeter", data, "P1 does not seem to be connected" + device, "heater_central", data, "no OpenTherm communication" ) - # OpenTherm device - if device["name"] != "OnOff": - self._check_availability( - device, "heater_central", data, "no OpenTherm communication" - ) # Switching groups data self._device_data_switching_group(device, data) @@ -524,9 +520,9 @@ async def _full_update_device(self) -> None: self._get_plugwise_notifications() self._locations = await self._request(LOCATIONS) self._modules = await self._request(MODULES) - # P1 legacy has no appliances - if not (self.smile_type == "power" and self._smile_legacy): - self._appliances = await self._request(APPLIANCES) +# # P1 legacy has no appliances +# if not (self.smile_type == "power" and self._smile_legacy): +# self._appliances = await self._request(APPLIANCES) def _get_plugwise_notifications(self) -> None: """Collect the Plugwise notifications.""" From b71e82caa6abc487af4baf25c783a0095d04c6d9 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 31 Dec 2023 14:45:08 +0100 Subject: [PATCH 010/306] Remove legacy reference in tests --- tests/test_adam.py | 1 - tests/test_anna.py | 5 ----- tests/test_init.py | 8 -------- 3 files changed, 14 deletions(-) diff --git a/tests/test_adam.py b/tests/test_adam.py index f952a18ab..90898e550 100644 --- a/tests/test_adam.py +++ b/tests/test_adam.py @@ -163,7 +163,6 @@ async def test_connect_adam_onoff_cooling_fake_firmware(self): _LOGGER, smile, smile_version=None, - smile_legacy=None, ) await self.device_test(smile, "2022-01-02 00:00:01", testdata) diff --git a/tests/test_anna.py b/tests/test_anna.py index 82fbba090..8350004bc 100644 --- a/tests/test_anna.py +++ b/tests/test_anna.py @@ -287,7 +287,6 @@ async def test_connect_anna_heatpump_cooling_fake_firmware(self): _LOGGER, smile, smile_version="4.10.10", - smile_legacy=None, ) await self.device_test(smile, "2020-04-19 00:00:01", testdata) @@ -393,7 +392,6 @@ async def test_connect_anna_elga_2_cooling(self): smile, smile_version="4.2.1", ) - assert not smile._smile_legacy await self.device_test(smile, "2022-03-10 00:00:01", testdata) assert ( @@ -423,7 +421,6 @@ async def test_connect_anna_loria_heating_idle(self): _LOGGER, smile, smile_version=None, - smile_legacy=None, ) await self.device_test(smile, "2022-05-16 00:00:01", testdata) @@ -479,7 +476,6 @@ async def test_connect_anna_loria_cooling_active(self): _LOGGER, smile, smile_version=None, - smile_legacy=None, ) await self.device_test(smile, "2022-05-16 00:00:01", testdata) @@ -504,7 +500,6 @@ async def test_connect_anna_loria_driessens(self): _LOGGER, smile, smile_version=None, - smile_legacy=None, ) await self.device_test(smile, "2022-05-16 00:00:01", testdata) diff --git a/tests/test_init.py b/tests/test_init.py index 81f531417..7554b2be7 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -707,7 +707,6 @@ def validate_test_basics( smile, smile_type="thermostat", smile_version=None, - smile_legacy=False, ): """Produce visual assertion of components base validation.""" parent_logger.info("Basics:") @@ -719,13 +718,6 @@ def validate_test_basics( log_msg = f" # Assert version matching '{smile_version}" parent_logger.info(log_msg) assert smile.smile_version[0] == smile_version - if smile_version: - log_msg = f" # Assert legacy {smile_legacy}" - parent_logger.info(log_msg) - if smile_legacy: - assert smile._smile_legacy - else: - assert not smile._smile_legacy class PlugwiseTestError(Exception): """Plugwise test exceptions class.""" From 76a45dee1c44a87fc6112013e20a9482fce1fd49 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 31 Dec 2023 14:51:14 +0100 Subject: [PATCH 011/306] Fix --- plugwise/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugwise/__init__.py b/plugwise/__init__.py index 138adf623..f2c8889ee 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -522,7 +522,7 @@ async def _full_update_device(self) -> None: self._modules = await self._request(MODULES) # # P1 legacy has no appliances # if not (self.smile_type == "power" and self._smile_legacy): -# self._appliances = await self._request(APPLIANCES) + self._appliances = await self._request(APPLIANCES) def _get_plugwise_notifications(self) -> None: """Collect the Plugwise notifications.""" From 5ac13dbb06f4ddd75537d4d42afe2b3c7cae74e9 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 31 Dec 2023 14:55:52 +0100 Subject: [PATCH 012/306] Clarified --- plugwise/helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugwise/helper.py b/plugwise/helper.py index 7db0f0d3b..f91bd42a6 100644 --- a/plugwise/helper.py +++ b/plugwise/helper.py @@ -1058,7 +1058,7 @@ def _get_measurement_data(self, dev_id: str) -> DeviceData: return data - # Get non-p1 data from APPLIANCES - BOUWEW what does this mean? + # Get non-P1 data from APPLIANCES measurements = DEVICE_MEASUREMENTS if self._is_thermostat and dev_id == self._heater_id: measurements = HEATER_CENTRAL_MEASUREMENTS From 6a698ad501d10b5b8ffce80d3504bbda2eca2ecc Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 31 Dec 2023 19:37:21 +0100 Subject: [PATCH 013/306] Remove commented-out lines --- plugwise/__init__.py | 121 ---------------------- plugwise/helper.py | 234 +------------------------------------------ 2 files changed, 1 insertion(+), 354 deletions(-) diff --git a/plugwise/__init__.py b/plugwise/__init__.py index f2c8889ee..39a8ff380 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -31,12 +31,9 @@ NONE, NOTIFICATIONS, OFF, -# REQUIRE_APPLIANCES, RULES, SMILES, -# STATUS, SWITCH_GROUP_TYPES, -# SYSTEM, ZONE_THERMOSTATS, ActuatorData, DeviceData, @@ -358,11 +355,7 @@ def __init__( async def connect(self) -> bool: """Connect to Plugwise device and determine its name, type and version.""" result = await self._request(DOMAIN_OBJECTS) -# # Work-around for Stretch fv 2.7.18 -# if not (vendor_names := result.findall("./module/vendor_name")): -# result = await self._request(MODULES) vendor_names = result.findall("./module/vendor_name") - names: list[str] = [] for name in vendor_names: names.append(name.text) @@ -396,53 +389,6 @@ async def connect(self) -> bool: return True -# async def _smile_detect_legacy( -# self, result: etree, dsmrmain: etree, model: str -# ) -> str: -# """Helper-function for _smile_detect().""" -# return_model = model -# # Stretch: find the MAC of the zigbee master_controller (= Stick) -# if (network := result.find("./module/protocols/master_controller")) is not None: -# self.smile_zigbee_mac_address = network.find("mac_address").text -# # Find the active MAC in case there is an orphaned Stick -# if zb_networks := result.findall("./network"): -# for zb_network in zb_networks: -# if zb_network.find("./nodes/network_router") is not None: -# network = zb_network.find("./master_controller") -# self.smile_zigbee_mac_address = network.find("mac_address").text -# -# # Legacy Anna or Stretch: -# if ( -# result.find('./appliance[type="thermostat"]') is not None -# or network is not None -# ): -# self._system = await self._request(SYSTEM) -# self.smile_fw_version = self._system.find("./gateway/firmware").text -# return_model = self._system.find("./gateway/product").text -# self.smile_hostname = self._system.find("./gateway/hostname").text -# # If wlan0 contains data it's active, so eth0 should be checked last -# for network in ("wlan0", "eth0"): -# locator = f"./{network}/mac" -# if (net_locator := self._system.find(locator)) is not None: -# self.smile_mac_address = net_locator.text -# # P1 legacy: -# elif dsmrmain is not None: -# self._status = await self._request(STATUS) -# self.smile_fw_version = self._status.find("./system/version").text -# return_model = self._status.find("./system/product").text -# self.smile_hostname = self._status.find("./network/hostname").text -# self.smile_mac_address = self._status.find("./network/mac_address").text -# else: # pragma: no cover -# # No cornercase, just end of the line -# LOGGER.error( -# "Connected but no gateway device information found, please create" -# " an issue on http://github.com/plugwise/python-plugwise" -# ) -# raise ResponseError -# -# self._smile_legacy = True -# return return_model - async def _smile_detect(self, result: etree, dsmrmain: etree) -> None: """Helper-function for connect(). @@ -456,8 +402,6 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None: self.smile_hw_version = gateway.find("hardware_version").text self.smile_hostname = gateway.find("hostname").text self.smile_mac_address = gateway.find("mac_address").text - # else: - # model = await self._smile_detect_legacy(result, dsmrmain, model) if model == "Unknown" or self.smile_fw_version is None: # pragma: no cover # Corner case check @@ -490,10 +434,6 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None: self.smile_type = SMILES[self._target_smile].smile_type self.smile_version = (self.smile_fw_version, ver) -# if self.smile_type == "stretch": -# self._stretch_v2 = self.smile_version[1].major == 2 -# self._stretch_v3 = self.smile_version[1].major == 3 - if self.smile_type == "thermostat": self._is_thermostat = True # For Adam, Anna, determine the system capabilities: @@ -520,8 +460,6 @@ async def _full_update_device(self) -> None: self._get_plugwise_notifications() self._locations = await self._request(LOCATIONS) self._modules = await self._request(MODULES) -# # P1 legacy has no appliances -# if not (self.smile_type == "power" and self._smile_legacy): self._appliances = await self._request(APPLIANCES) def _get_plugwise_notifications(self) -> None: @@ -560,8 +498,6 @@ async def async_update(self) -> PlugwiseData: self._domain_objects = await self._request(DOMAIN_OBJECTS) self._get_plugwise_notifications() match self._target_smile: -# case "smile_v2": -# self._modules = await self._request(MODULES) case "smile_v4": self._locations = await self._request(LOCATIONS) case "smile_open_therm_v3": @@ -576,39 +512,6 @@ async def async_update(self) -> PlugwiseData: self._previous_day_number = day_number return PlugwiseData(self.gw_data, self.gw_devices) -# async def _set_schedule_state_legacy( -# self, loc_id: str, name: str, status: str -# ) -> None: -# """Helper-function for set_schedule_state().""" -# schedule_rule_id: str | None = None -# for rule in self._domain_objects.findall("rule"): -# if rule.find("name").text == name: -# schedule_rule_id = rule.attrib["id"] -# -# if schedule_rule_id is None: -# raise PlugwiseError("Plugwise: no schedule with this name available.") -# -# new_state = "false" -# if status == "on": -# new_state = "true" -# # If no state change is requested, do nothing -# if new_state == self._schedule_old_states[loc_id][name]: -# return -# -# locator = f'.//*[@id="{schedule_rule_id}"]/template' -# for rule in self._domain_objects.findall(locator): -# template_id = rule.attrib["id"] -# -# uri = f"{RULES};id={schedule_rule_id}" -# data = ( -# "{new_state}' -# ) -# -# await self._request(uri, method="put", data=data) -# self._schedule_old_states[loc_id][name] = new_state - def determine_contexts( self, loc_id: str, name: str, state: str, sched_id: str ) -> etree: @@ -655,10 +558,6 @@ async def set_schedule_state( return assert isinstance(name, str) -# if self._smile_legacy: -# await self._set_schedule_state_legacy(loc_id, name, new_state) -# return - schedule_rule = self._rule_ids_by_name(name, loc_id) # Raise an error when the schedule name does not exist if not schedule_rule or schedule_rule is None: @@ -687,14 +586,6 @@ async def set_schedule_state( await self._request(uri, method="put", data=data) self._schedule_old_states[loc_id][name] = new_state -# async def _set_preset_legacy(self, preset: str) -> None: -# """Set the given Preset on the relevant Thermostat - from DOMAIN_OBJECTS.""" -# locator = f'rule/directives/when/then[@icon="{preset}"].../.../...' -# rule = self._domain_objects.find(locator) -# data = f'true' -# -# await self._request(RULES, method="put", data=data) - async def set_preset(self, loc_id: str, preset: str) -> None: """Set the given Preset on the relevant Thermostat - from LOCATIONS.""" if (presets := self._presets(loc_id)) is None: @@ -702,10 +593,6 @@ async def set_preset(self, loc_id: str, preset: str) -> None: if preset not in list(presets): raise PlugwiseError("Plugwise: invalid preset.") -# if self._smile_legacy: -# await self._set_preset_legacy(preset) -# return - current_location = self._locations.find(f'location[@id="{loc_id}"]') location_name = current_location.find("name").text location_type = current_location.find("type").text @@ -801,8 +688,6 @@ async def _set_groupswitch_member_state( locator = f'appliance[@id="{member}"]/{switch.actuator}/{switch.func_type}' switch_id = self._appliances.find(locator).attrib["id"] uri = f"{APPLIANCES};id={member}/{switch.device};id={switch_id}" -# if self._stretch_v2: -# uri = f"{APPLIANCES};id={member}/{switch.device}" data = f"<{switch.func_type}><{switch.func}>{state}" await self._request(uri, method="put", data=data) @@ -830,10 +715,6 @@ async def set_switch_state( switch.func = "lock" state = "false" if state == "off" else "true" -# if self._stretch_v2: -# switch.actuator = "actuators" -# switch.func_type = "relay" - if members is not None: return await self._set_groupswitch_member_state(members, state, switch) @@ -848,8 +729,6 @@ async def set_switch_state( break uri = f"{APPLIANCES};id={appl_id}/{switch.device};id={switch_id}" -# if self._stretch_v2: -# uri = f"{APPLIANCES};id={appl_id}/{switch.device}" data = f"<{switch.func_type}><{switch.func}>{state}" if model == "relay": diff --git a/plugwise/helper.py b/plugwise/helper.py index f91bd42a6..8e35140a4 100644 --- a/plugwise/helper.py +++ b/plugwise/helper.py @@ -23,7 +23,6 @@ ACTUATOR_CLASSES, ADAM, ANNA, -# APPLIANCES, ATTR_NAME, ATTR_UNIT_OF_MEASUREMENT, BINARY_SENSORS, @@ -32,8 +31,6 @@ DHW_SETPOINT, ENERGY_KILO_WATT_HOUR, ENERGY_WATT_HOUR, -# FAKE_APPL, -# FAKE_LOC, HEATER_CENTRAL_MEASUREMENTS, LIMITS, LOCATIONS, @@ -41,7 +38,6 @@ NONE, OBSOLETE_MEASUREMENTS, OFF, -# P1_LEGACY_MEASUREMENTS, P1_MEASUREMENTS, POWER_WATT, SENSORS, @@ -84,15 +80,6 @@ def check_model(name: str | None, vendor_name: str | None) -> str | None: return name -# def etree_to_dict(element: etree) -> dict[str, str]: -# """Helper-function translating xml Element to dict.""" -# node: dict[str, str] = {} -# if element is not None: -# node.update(element.items()) -# -# return node - - def power_data_local_format( attrs: dict[str, str], key_string: str, val: str ) -> float | int: @@ -148,9 +135,6 @@ async def _request_validate(self, resp: ClientResponse, method: str) -> etree: # Command accepted gives empty body with status 202 if resp.status == 202: return -# # Cornercase for stretch not responding with 202 -# if method == "put" and resp.status == 200: -# return if resp.status == 401: msg = "Invalid Plugwise login, please retry with the correct credentials." @@ -187,8 +171,6 @@ async def _request( if method == "delete": resp = await self._websession.delete(url, auth=self._auth) if method == "get": -# # Work-around for Stretchv2, should not hurt the other smiles -# use_headers = {"Accept-Encoding": "gzip"} resp = await self._websession.get( url, headers=use_headers, auth=self._auth ) @@ -248,10 +230,7 @@ def __init__(self) -> None: self._outdoor_temp: float self._reg_allowed_modes: list[str] = [] self._schedule_old_states: dict[str, dict[str, str]] = {} -# self._smile_legacy = False self._status: etree -# self._stretch_v2 = False -# self._stretch_v3 = False self._system: etree self._thermo_locs: dict[str, ThermoLoc] = {} ################################################################### @@ -291,32 +270,12 @@ def smile(self, name: str) -> bool: def _all_locations(self) -> None: """Collect all locations.""" loc = Munch() - locations = self._locations.findall("./location") -# # Legacy Anna without outdoor_temp and Stretches have no locations, create fake location-data -# if not locations and self._smile_legacy: -# self._home_location = FAKE_LOC -# self._loc_data[FAKE_LOC] = {"name": "Home"} -# return - for location in locations: loc.name = location.find("name").text loc.loc_id = location.attrib["id"] -# # Filter the valid single location for P1 legacy: services not empty -# locator = "./services" -# if ( -# self._smile_legacy -# and self.smile_type == "power" -# and len(location.find(locator)) == 0 -# ): -# continue - if loc.name == "Home": self._home_location = loc.loc_id -# # Replace location-name for P1 legacy, can contain privacy-related info -# if self._smile_legacy and self.smile_type == "power": -# loc.name = "Home" -# self._home_location = loc.loc_id self._loc_data[loc.loc_id] = {"name": loc.name} @@ -354,12 +313,6 @@ def _get_module_data( if (zb_node := module.find("./protocols/zig_bee_node")) is not None: model_data["zigbee_mac_address"] = zb_node.find("mac_address").text model_data["reachable"] = zb_node.find("reachable").text == "true" -# # Stretches -# if (router := module.find("./protocols/network_router")) is not None: -# model_data["zigbee_mac_address"] = router.find("mac_address").text -# # Also look for the Circle+/Stealth M+ -# if (coord := module.find("./protocols/network_coordinator")) is not None: -# model_data["zigbee_mac_address"] = coord.find("mac_address").text return model_data @@ -368,19 +321,12 @@ def _energy_device_info_finder(self, appliance: etree, appl: Munch) -> Munch: Collect energy device info (Circle, Plug, Stealth): firmware, model and vendor name. """ -# if self.smile_type in ("power", "stretch"): if self.smile_type == "power": -# locator = "./services/electricity_point_meter" -# if not self._smile_legacy: locator = "./logs/point_log/electricity_point_meter" mod_type = "electricity_point_meter" module_data = self._get_module_data(appliance, locator, mod_type) appl.zigbee_mac = module_data["zigbee_mac_address"] -# # Filter appliance without zigbee_mac, it's an orphaned device -# if appl.zigbee_mac is None and self.smile_type != "power": -# return None - appl.hardware = module_data["hardware_version"] appl.model = module_data["vendor_model"] appl.vendor_name = module_data["vendor_name"] @@ -505,7 +451,7 @@ def _appliance_info_finder(self, appliance: etree, appl: Munch) -> Munch: return appl - # Collect info from Stretches + # Collect info from Stretches - BOUWEW only needed for Stretches? appl = self._energy_device_info_finder(appliance, appl) return appl @@ -543,8 +489,6 @@ def _p1_smartmeter_info_finder(self, appl: Munch) -> None: loc_id = next(iter(self._loc_data.keys())) appl.dev_id = self.gateway_id appl.location = loc_id -# if self._smile_legacy: -# appl.dev_id = loc_id appl.mac = None appl.model = self.smile_model appl.name = "P1" @@ -571,45 +515,11 @@ def _p1_smartmeter_info_finder(self, appl: Munch) -> None: self.gw_devices[appl.dev_id][p1_key] = value self._count += 1 -# def _create_legacy_gateway(self) -> None: -# """Create the (missing) gateway devices for legacy Anna, P1 and Stretch. -# -# Use the home_location or FAKE_APPL as device id. -# """ -# self.gateway_id = self._home_location -# if self.smile_type == "power": -# self.gateway_id = FAKE_APPL -# -# self.gw_devices[self.gateway_id] = {"dev_class": "gateway"} -# self._count += 1 -# for key, value in { -# "firmware": self.smile_fw_version, -# "location": self._home_location, -# "mac_address": self.smile_mac_address, -# "model": self.smile_model, -# "name": self.smile_name, -# "zigbee_mac_address": self.smile_zigbee_mac_address, -# "vendor": "Plugwise", -# }.items(): -# if value is not None: -# gw_key = cast(ApplianceType, key) -# self.gw_devices[self.gateway_id][gw_key] = value -# self._count += 1 - def _all_appliances(self) -> None: """Collect all appliances with relevant info.""" self._count = 0 self._all_locations() -# if self._smile_legacy: -# self._create_legacy_gateway() -# # For legacy P1 collect the connected SmartMeter info -# if self.smile_type == "power": -# appl = Munch() -# self._p1_smartmeter_info_finder(appl) -# # Legacy P1 has no more devices -# return - for appliance in self._appliances.findall("./appliance"): appl = Munch() appl.pwclass = appliance.find("type").text @@ -723,28 +633,11 @@ def _control_state(self, loc_id: str) -> str | bool: return False -# def _presets_legacy(self) -> dict[str, list[float]]: -# """Helper-function for presets() - collect Presets for a legacy Anna.""" -# presets: dict[str, list[float]] = {} -# for directive in self._domain_objects.findall("rule/directives/when/then"): -# if directive is not None and directive.get("icon") is not None: -# # Ensure list of heating_setpoint, cooling_setpoint -# presets[directive.attrib["icon"]] = [ -# float(directive.attrib["temperature"]), -# 0, -# ] -# -# return presets - def _presets(self, loc_id: str) -> dict[str, list[float]]: """Collect Presets for a Thermostat based on location_id.""" presets: dict[str, list[float]] = {} tag_1 = "zone_setpoint_and_state_based_on_preset" tag_2 = "Thermostat presets" - -# if self._smile_legacy: -# return self._presets_legacy() - if not (rule_ids := self._rule_ids_by_tag(tag_1, loc_id)): if not (rule_ids := self._rule_ids_by_name(tag_2, loc_id)): return presets # pragma: no cover @@ -807,9 +700,6 @@ def _appliance_measurements( for measurement, attrs in measurements.items(): p_locator = f'.//logs/point_log[type="{measurement}"]/period/measurement' if (appl_p_loc := appliance.find(p_locator)) is not None: -# if self._smile_legacy and measurement == "domestic_hot_water_state": -# continue - # Skip known obsolete measurements updated_date_locator = ( f'.//logs/point_log[type="{measurement}"]/updated_date' @@ -927,10 +817,6 @@ def _get_actuator_functionalities( functionality = "thermostat_functionality" if item == "temperature_offset": functionality = "offset_functionality" -# # Don't support temperature_offset for legacy Anna -# if self._smile_legacy: -# continue - # When there is no updated_date-text, skip the actuator updated_date_location = f'.//actuator_functionalities/{functionality}[type="{item}"]/updated_date' if ( @@ -1051,10 +937,7 @@ def _get_measurement_data(self, dev_id: str) -> DeviceData: # !! DON'T CHANGE below two if-lines, will break stuff !! if self.smile_type == "power": if device["dev_class"] == "smartmeter": -# if not self._smile_legacy: data.update(self._power_data_from_location(device["location"])) -# else: -# data.update(self._power_data_from_modules()) return data @@ -1188,24 +1071,11 @@ def _scan_thermostats(self) -> None: if "slaves" in tl_loc_id and dev_id in tl_loc_id["slaves"]: device["dev_class"] = "thermo_sensor" -# def _thermostat_uri_legacy(self) -> str: -# """Helper-function for _thermostat_uri(). -# -# Determine the location-set_temperature uri - from APPLIANCES. -# """ -# locator = "./appliance[type='thermostat']" -# appliance_id = self._appliances.find(locator).attrib["id"] -# -# return f"{APPLIANCES};id={appliance_id}/thermostat" - def _thermostat_uri(self, loc_id: str) -> str: """Helper-function for smile.py: set_temperature(). Determine the location-set_temperature uri - from LOCATIONS. """ -# if self._smile_legacy: -# return self._thermostat_uri_legacy() - locator = f'./location[@id="{loc_id}"]/actuator_functionalities/thermostat_functionality' thermostat_functionality_id = self._locations.find(locator).attrib["id"] @@ -1299,7 +1169,6 @@ def _power_data_peak_value(self, loc: Munch) -> Munch: """Helper-function for _power_data_from_location() and _power_data_from_modules().""" loc.found = True # If locator not found look for P1 gas_consumed or phase data (without tariff) -# # or for P1 legacy electricity_point_meter or gas_*_meter data if loc.logs.find(loc.locator) is None: if "log" in loc.log_type and ( "gas" in loc.measurement or "phase" in loc.measurement @@ -1315,22 +1184,6 @@ def _power_data_peak_value(self, loc: Munch) -> Munch: if loc.logs.find(loc.locator) is None: loc.found = False return loc -# # P1 legacy point_meter has no tariff_indicator -# elif "meter" in loc.log_type and ( -# "point" in loc.log_type or "gas" in loc.measurement -# ): -# # Avoid double processing by skipping one peak-list option -# if loc.peak_select == "nl_offpeak": -# loc.found = False -# return loc -# -# loc.locator = ( -# f"./{loc.meas_list[0]}_{loc.log_type}/" -# f'measurement[@directionality="{loc.meas_list[1]}"]' -# ) -# if loc.logs.find(loc.locator) is None: -# loc.found = False -# return loc else: loc.found = False return loc @@ -1382,93 +1235,16 @@ def _power_data_from_location(self, loc_id: str) -> DeviceData: self._count += len(direct_data["sensors"]) return direct_data -# def _power_data_from_modules(self) -> DeviceData: -# """Helper-function for smile.py: _get_device_data(). -# -# Collect the power-data from MODULES (P1 legacy only). -# """ -# direct_data: DeviceData = {"sensors": {}} -# loc = Munch() -# mod_list: list[str] = ["interval_meter", "cumulative_meter", "point_meter"] -# peak_list: list[str] = ["nl_peak", "nl_offpeak"] -# t_string = "tariff_indicator" -# -# search = self._modules -# mod_logs = search.findall("./module/services") -# for loc.measurement, loc.attrs in P1_LEGACY_MEASUREMENTS.items(): -# loc.meas_list = loc.measurement.split("_") -# for loc.logs in mod_logs: -# for loc.log_type in mod_list: -# for loc.peak_select in peak_list: -# loc.locator = ( -# f"./{loc.meas_list[0]}_{loc.log_type}/measurement" -# f'[@directionality="{loc.meas_list[1]}"][@{t_string}="{loc.peak_select}"]' -# ) -# loc = self._power_data_peak_value(loc) -# if not loc.found: -# continue -# -# direct_data = self.power_data_energy_diff( -# loc.measurement, loc.net_string, loc.f_val, direct_data -# ) -# key = cast(SensorType, loc.key_string) -# direct_data["sensors"][key] = loc.f_val -# -# self._count += len(direct_data["sensors"]) -# return direct_data - def _preset(self, loc_id: str) -> str | None: """Helper-function for smile.py: device_data_climate(). Collect the active preset based on Location ID. """ -# if not self._smile_legacy: locator = f'./location[@id="{loc_id}"]/preset' if (preset := self._domain_objects.find(locator)) is not None: return str(preset.text) return None -# locator = "./rule[active='true']/directives/when/then" -# if ( -# not (active_rule := etree_to_dict(self._domain_objects.find(locator))) -# or "icon" not in active_rule -# ): -# return None -# -# return active_rule["icon"] - -# def _schedules_legacy( -# self, -# avail: list[str], -# location: str, -# sel: str, -# ) -> tuple[list[str], str]: -# """Helper-function for _schedules(). -# -# Collect available schedules/schedules for the legacy thermostat. -# """ -# name: str | None = None -# -# search = self._domain_objects -# for schedule in search.findall("./rule"): -# if rule_name := schedule.find("name").text: -# if "preset" not in rule_name: -# name = rule_name -# -# log_type = "schedule_state" -# locator = f"./appliance[type='thermostat']/logs/point_log[type='{log_type}']/period/measurement" -# active = False -# if (result := search.find(locator)) is not None: -# active = result.text == "on" -# -# if name is not None: -# avail = [name] -# if active: -# sel = name -# -# self._last_active[location] = "".join(map(str, avail)) -# return avail, sel - def _schedules(self, location: str) -> tuple[list[str], str]: """Helper-function for smile.py: _device_data_climate(). @@ -1478,11 +1254,6 @@ def _schedules(self, location: str) -> tuple[list[str], str]: available: list[str] = [NONE] rule_ids: dict[str, dict[str, str]] = {} selected = NONE - -# # Legacy Anna schedule, only one schedule allowed -# if self._smile_legacy: -# return self._schedules_legacy(available, location, selected) - # Adam schedules, one schedule can be linked to various locations # self._last_active contains the locations and the active schedule name per location, or None if location not in self._last_active: @@ -1552,9 +1323,6 @@ def _get_lock_state(self, xml: etree, data: DeviceData) -> None: """ actuator = "actuator_functionalities" func_type = "relay_functionality" -# if self._stretch_v2: -# actuator = "actuators" -# func_type = "relay" if xml.find("type").text not in SPECIAL_PLUG_TYPES: locator = f"./{actuator}/{func_type}/lock" if (found := xml.find(locator)) is not None: From 6f8492d663fd67464180ca28e1fe7a5244d27296 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 31 Dec 2023 19:47:08 +0100 Subject: [PATCH 014/306] Search only in domain_objects --- plugwise/__init__.py | 43 ++++++++----------------------------------- plugwise/helper.py | 25 +++++++++++-------------- 2 files changed, 19 insertions(+), 49 deletions(-) diff --git a/plugwise/__init__.py b/plugwise/__init__.py index 39a8ff380..881e24138 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -458,9 +458,6 @@ async def _full_update_device(self) -> None: """Perform a first fetch of all XML data, needed for initialization.""" self._domain_objects = await self._request(DOMAIN_OBJECTS) self._get_plugwise_notifications() - self._locations = await self._request(LOCATIONS) - self._modules = await self._request(MODULES) - self._appliances = await self._request(APPLIANCES) def _get_plugwise_notifications(self) -> None: """Collect the Plugwise notifications.""" @@ -481,35 +478,11 @@ def _get_plugwise_notifications(self) -> None: async def async_update(self) -> PlugwiseData: """Perform an incremental update for updating the various device states.""" # Perform a full update at day-change - day_number = dt.datetime.now().strftime("%w") - if ( - day_number # pylint: disable=consider-using-assignment-expr - != self._previous_day_number - ): - LOGGER.debug( - "Performing daily full-update, reload the Plugwise integration when a single entity becomes unavailable." - ) - self.gw_data: GatewayData = {} - self.gw_devices: dict[str, DeviceData] = {} - await self._full_update_device() - self.get_all_devices() - # Otherwise perform an incremental update - else: - self._domain_objects = await self._request(DOMAIN_OBJECTS) - self._get_plugwise_notifications() - match self._target_smile: - case "smile_v4": - self._locations = await self._request(LOCATIONS) - case "smile_open_therm_v3": - self._appliances = await self._request(APPLIANCES) - self._modules = await self._request(MODULES) - case "smile_thermo_v4": - self._appliances = await self._request(APPLIANCES) - - self._update_gw_devices() - self.gw_data["notifications"] = self._notifications - - self._previous_day_number = day_number + self.gw_data: GatewayData = {} + self.gw_devices: dict[str, DeviceData] = {} + await self._full_update_device() + self.get_all_devices() + return PlugwiseData(self.gw_data, self.gw_devices) def determine_contexts( @@ -593,7 +566,7 @@ async def set_preset(self, loc_id: str, preset: str) -> None: if preset not in list(presets): raise PlugwiseError("Plugwise: invalid preset.") - current_location = self._locations.find(f'location[@id="{loc_id}"]') + current_location = self._domain_objects.find(f'location[@id="{loc_id}"]') location_name = current_location.find("name").text location_type = current_location.find("type").text @@ -652,7 +625,7 @@ async def set_number_setpoint(self, key: str, _: str, temperature: float) -> Non temp = str(temperature) thermostat_id: str | None = None locator = f'appliance[@id="{self._heater_id}"]/actuator_functionalities/thermostat_functionality' - if th_func_list := self._appliances.findall(locator): + if th_func_list := self._domain_objects.findall(locator): for th_func in th_func_list: if th_func.find("type").text == key: thermostat_id = th_func.attrib["id"] @@ -719,7 +692,7 @@ async def set_switch_state( return await self._set_groupswitch_member_state(members, state, switch) locator = f'appliance[@id="{appl_id}"]/{switch.actuator}/{switch.func_type}' - found: list[etree] = self._appliances.findall(locator) + found: list[etree] = self._domain_objects.findall(locator) for item in found: if (sw_type := item.find("type")) is not None: if sw_type.text == switch.act_type: diff --git a/plugwise/helper.py b/plugwise/helper.py index 8e35140a4..2f1014e07 100644 --- a/plugwise/helper.py +++ b/plugwise/helper.py @@ -207,7 +207,6 @@ class SmileHelper: def __init__(self) -> None: """Set the constructor for this class.""" - self._appliances: etree self._cooling_activation_outdoor_temp: float self._cooling_deactivation_threshold: float self._cooling_present = False @@ -221,9 +220,7 @@ def __init__(self) -> None: self._is_thermostat = False self._last_active: dict[str, str | None] = {} self._last_modified: dict[str, str] = {} - self._locations: etree self._loc_data: dict[str, ThermoLoc] = {} - self._modules: etree self._notifications: dict[str, dict[str, str]] = {} self._on_off_device = False self._opentherm_device = False @@ -270,7 +267,7 @@ def smile(self, name: str) -> bool: def _all_locations(self) -> None: """Collect all locations.""" loc = Munch() - locations = self._locations.findall("./location") + locations = self._domain_objects.findall("./location") for location in locations: loc.name = location.find("name").text loc.loc_id = location.attrib["id"] @@ -299,7 +296,7 @@ def _get_module_data( link_id = appl_search.attrib["id"] loc = f".//{mod_type}[@id='{link_id}']...." # Not possible to walrus for some reason... - module = self._modules.find(loc) + module = self._domain_objects.find(loc) if module is not None: # pylint: disable=consider-using-assignment-expr model_data["contents"] = True if (vendor_name := module.find("vendor_name").text) is not None: @@ -369,7 +366,7 @@ def _appliance_info_finder(self, appliance: etree, appl: Munch) -> Munch: # Adam: look for the ZigBee MAC address of the Smile if self.smile(ADAM) and ( - (found := self._modules.find(".//protocols/zig_bee_coordinator")) is not None + (found := self._domain_objects.find(".//protocols/zig_bee_coordinator")) is not None ): appl.zigbee_mac = found.find("mac_address").text @@ -465,7 +462,7 @@ def _check_heater_central(self) -> str: locator = "./appliance[type='heater_central']" hc_count = 0 hc_list: list[dict[str, bool]] = [] - for heater_central in self._appliances.findall(locator): + for heater_central in self._domain_objects.findall(locator): hc_count += 1 hc_id: str = heater_central.attrib["id"] has_actuators: bool = ( @@ -494,7 +491,7 @@ def _p1_smartmeter_info_finder(self, appl: Munch) -> None: appl.name = "P1" appl.pwclass = "smartmeter" appl.zigbee_mac = None - location = self._locations.find(f'./location[@id="{loc_id}"]') + location = self._domain_objects.find(f'./location[@id="{loc_id}"]') appl = self._energy_device_info_finder(location, appl) self.gw_devices[appl.dev_id] = {"dev_class": appl.pwclass} @@ -520,7 +517,7 @@ def _all_appliances(self) -> None: self._count = 0 self._all_locations() - for appliance in self._appliances.findall("./appliance"): + for appliance in self._domain_objects.findall("./appliance"): appl = Munch() appl.pwclass = appliance.find("type").text # Skip thermostats that have this key, should be an orphaned device (Core #81712) @@ -793,7 +790,7 @@ def _wireless_availability(self, appliance: etree, data: DeviceData) -> None: def _get_appliances_with_offset_functionality(self) -> list[str]: """Helper-function collecting all appliance that have offset_functionality.""" therm_list: list[str] = [] - offset_appls = self._appliances.findall( + offset_appls = self._domain_objects.findall( './/actuator_functionalities/offset_functionality[type="temperature_offset"]/offset/../../..' ) for item in offset_appls: @@ -951,7 +948,7 @@ def _get_measurement_data(self, dev_id: str) -> DeviceData: # Counting of this item is done in _appliance_measurements() if ( - appliance := self._appliances.find(f'./appliance[@id="{dev_id}"]') + appliance := self._domain_objects.find(f'./appliance[@id="{dev_id}"]') ) is not None: self._appliance_measurements(appliance, data, measurements) self._get_lock_state(appliance, data) @@ -1077,7 +1074,7 @@ def _thermostat_uri(self, loc_id: str) -> str: Determine the location-set_temperature uri - from LOCATIONS. """ locator = f'./location[@id="{loc_id}"]/actuator_functionalities/thermostat_functionality' - thermostat_functionality_id = self._locations.find(locator).attrib["id"] + thermostat_functionality_id = self._domain_objects.find(locator).attrib["id"] return f"{LOCATIONS};id={loc_id}/thermostat;id={thermostat_functionality_id}" @@ -1125,7 +1122,7 @@ def _heating_valves(self) -> int | bool: """ loc_found: int = 0 open_valve_count: int = 0 - for appliance in self._appliances.findall("./appliance"): + for appliance in self._domain_objects.findall("./appliance"): locator = './logs/point_log[type="valve_position"]/period/measurement' if (appl_loc := appliance.find(locator)) is not None: loc_found += 1 @@ -1213,7 +1210,7 @@ def _power_data_from_location(self, loc_id: str) -> DeviceData: peak_list: list[str] = ["nl_peak", "nl_offpeak"] t_string = "tariff" - search = self._locations + search = self._domain_objects loc.logs = search.find(f'./location[@id="{loc_id}"]/logs') for loc.measurement, loc.attrs in P1_MEASUREMENTS.items(): for loc.log_type in log_list: From 7bb42445c5eff20b774a1f606293819553d97756 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 31 Dec 2023 19:49:00 +0100 Subject: [PATCH 015/306] Improve locator --- plugwise/helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugwise/helper.py b/plugwise/helper.py index 2f1014e07..0b0daa338 100644 --- a/plugwise/helper.py +++ b/plugwise/helper.py @@ -294,7 +294,7 @@ def _get_module_data( } if (appl_search := appliance.find(locator)) is not None: link_id = appl_search.attrib["id"] - loc = f".//{mod_type}[@id='{link_id}']...." + loc = f".//services/{mod_type}[@id='{link_id}']...." # Not possible to walrus for some reason... module = self._domain_objects.find(loc) if module is not None: # pylint: disable=consider-using-assignment-expr From d66f4c2ff91315cf6275dd68c230ddcbfab00918 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Mon, 1 Jan 2024 10:29:17 +0100 Subject: [PATCH 016/306] Adapt device_test to async_update() changes --- tests/test_init.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/test_init.py b/tests/test_init.py index 7554b2be7..00ab4d0fb 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -391,8 +391,6 @@ async def device_test( with freeze_time(test_time): if initialize: _LOGGER.info("Asserting testdata:") - await smile._full_update_device() - smile.get_all_devices() data = await smile.async_update() else: _LOGGER.info("Asserting updated testdata:") From 5604ca56ff7176275aefb6b040d8580086085cd9 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Mon, 1 Jan 2024 10:50:06 +0100 Subject: [PATCH 017/306] Rework breaking core/locations to breaking core/domain_objects --- tests/test_init.py | 102 +++++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 50 deletions(-) diff --git a/tests/test_init.py b/tests/test_init.py index 00ab4d0fb..096fb02f9 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -26,6 +26,8 @@ pp = PrettyPrinter(indent=8) +CORE_DOMAIN_OBJECTS = "/core/domain_objects" +CORE_DOMAIN_OBJECTS_TAIL = "/core/domain_objects{tail:.*}" CORE_LOCATIONS = "/core/locations" CORE_LOCATIONS_TAIL = "/core/locations{tail:.*}" CORE_APPLIANCES_TAIL = "/core/appliances{tail:.*}" @@ -94,18 +96,18 @@ async def setup_app( app.router.add_route("PUT", "/{tail:.*}", self.smile_fail_auth) return app - app.router.add_get("/core/appliances", self.smile_appliances) - app.router.add_get("/core/domain_objects", self.smile_domain_objects) - app.router.add_get("/core/modules", self.smile_modules) - app.router.add_get("/system/status.xml", self.smile_status) - app.router.add_get("/system", self.smile_status) + # app.router.add_get("/core/appliances", self.smile_appliances) + # app.router.add_get("/core/domain_objects", self.smile_domain_objects) + # app.router.add_get("/core/modules", self.smile_modules) + # app.router.add_get("/system/status.xml", self.smile_status) + # app.router.add_get("/system", self.smile_status) if broken: - app.router.add_get(CORE_LOCATIONS, self.smile_broken) + app.router.add_get(CORE_DOMAIN_OBJECTS, self.smile_broken) elif timeout: - app.router.add_get(CORE_LOCATIONS, self.smile_timeout) + app.router.add_get(CORE_DOMAIN_OBJECTS, self.smile_timeout) else: - app.router.add_get(CORE_LOCATIONS, self.smile_locations) + app.router.add_get(CORE_DOMAIN_OBJECTS, self.smile_domain_objects) # Introducte timeout with 2 seconds, test by setting response to 10ms # Don't actually wait 2 seconds as this will prolongue testing @@ -132,15 +134,15 @@ async def setup_app( return app # Wrapper for appliances uri - async def smile_appliances(self, request): - """Render setup specific appliances endpoint.""" - userdata = os.path.join( - os.path.dirname(__file__), - f"../userdata/{self.smile_setup}/core.appliances.xml", - ) - with open(userdata, encoding="utf-8") as filedata: - data = filedata.read() - return aiohttp.web.Response(text=data) +# async def smile_appliances(self, request): +# """Render setup specific appliances endpoint.""" +# userdata = os.path.join( +# os.path.dirname(__file__), +# f"../userdata/{self.smile_setup}/core.appliances.xml", +# ) +# with open(userdata, encoding="utf-8") as filedata: +# data = filedata.read() +# return aiohttp.web.Response(text=data) async def smile_domain_objects(self, request): """Render setup specific domain objects endpoint.""" @@ -152,38 +154,38 @@ async def smile_domain_objects(self, request): data = filedata.read() return aiohttp.web.Response(text=data) - async def smile_locations(self, request): - """Render setup specific locations endpoint.""" - userdata = os.path.join( - os.path.dirname(__file__), - f"../userdata/{self.smile_setup}/core.locations.xml", - ) - with open(userdata, encoding="utf-8") as filedata: - data = filedata.read() - return aiohttp.web.Response(text=data) - - async def smile_modules(self, request): - """Render setup specific modules endpoint.""" - userdata = os.path.join( - os.path.dirname(__file__), - f"../userdata/{self.smile_setup}/core.modules.xml", - ) - with open(userdata, encoding="utf-8") as filedata: - data = filedata.read() - return aiohttp.web.Response(text=data) - - async def smile_status(self, request): - """Render setup specific status endpoint.""" - try: - userdata = os.path.join( - os.path.dirname(__file__), - f"../userdata/{self.smile_setup}/system_status_xml.xml", - ) - with open(userdata, encoding="utf-8") as filedata: - data = filedata.read() - return aiohttp.web.Response(text=data) - except OSError as exc: - raise aiohttp.web.HTTPNotFound from exc +# async def smile_locations(self, request): +# """Render setup specific locations endpoint.""" +# userdata = os.path.join( +# os.path.dirname(__file__), +# f"../userdata/{self.smile_setup}/core.locations.xml", +# ) +# with open(userdata, encoding="utf-8") as filedata: +# data = filedata.read() +# return aiohttp.web.Response(text=data) + +# async def smile_modules(self, request): +# """Render setup specific modules endpoint.""" +# userdata = os.path.join( +# os.path.dirname(__file__), +# f"../userdata/{self.smile_setup}/core.modules.xml", +# ) +# with open(userdata, encoding="utf-8") as filedata: +# data = filedata.read() +# return aiohttp.web.Response(text=data) + +# async def smile_status(self, request): +# """Render setup specific status endpoint.""" +# try: +# userdata = os.path.join( +# os.path.dirname(__file__), +# f"../userdata/{self.smile_setup}/system_status_xml.xml", +# ) +# with open(userdata, encoding="utf-8") as filedata: +# data = filedata.read() +# return aiohttp.web.Response(text=data) +# except OSError: +# raise aiohttp.web.HTTPNotFound @classmethod async def smile_http_accept(cls, request): @@ -249,7 +251,7 @@ async def connect( client = aiohttp.test_utils.TestClient(server) websession = client.session - url = f"{server.scheme}://{server.host}:{server.port}{CORE_LOCATIONS}" + url = f"{server.scheme}://{server.host}:{server.port}{CORE_DOMAIN_OBJECTS}" # Try/exceptpass to accommodate for Timeout of aoihttp try: From 0a95da3f0b700a24406097c5a3fca01348961f00 Mon Sep 17 00:00:00 2001 From: autoruff Date: Mon, 1 Jan 2024 11:54:10 +0000 Subject: [PATCH 018/306] fixup: split_legacy Python code fixed using ruff --- plugwise/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugwise/__init__.py b/plugwise/__init__.py index 881e24138..384946486 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -27,7 +27,6 @@ LOGGER, MAX_SETPOINT, MIN_SETPOINT, - MODULES, NONE, NOTIFICATIONS, OFF, From f4d6a41d244fb56e1a9cc04e5746c7ac7b43ba65 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Mon, 1 Jan 2024 13:03:37 +0100 Subject: [PATCH 019/306] Change missed to domain_objects --- plugwise/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugwise/__init__.py b/plugwise/__init__.py index 384946486..d8de37e9f 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -658,7 +658,7 @@ async def _set_groupswitch_member_state( """ for member in members: locator = f'appliance[@id="{member}"]/{switch.actuator}/{switch.func_type}' - switch_id = self._appliances.find(locator).attrib["id"] + switch_id = self._domain_objects.find(locator).attrib["id"] uri = f"{APPLIANCES};id={member}/{switch.device};id={switch_id}" data = f"<{switch.func_type}><{switch.func}>{state}" @@ -708,7 +708,7 @@ async def set_switch_state( f'appliance[@id="{appl_id}"]/{switch.actuator}/{switch.func_type}/lock' ) # Don't bother switching a relay when the corresponding lock-state is true - if self._appliances.find(locator).text == "true": + if self._domain_objects.find(locator).text == "true": raise PlugwiseError("Plugwise: the locked Relay was not switched.") await self._request(uri, method="put", data=data) From a288281026b3eb056a22030af9014ea6b8785e75 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Mon, 1 Jan 2024 15:27:30 +0100 Subject: [PATCH 020/306] Update comment --- plugwise/helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugwise/helper.py b/plugwise/helper.py index 0b0daa338..fc925505e 100644 --- a/plugwise/helper.py +++ b/plugwise/helper.py @@ -448,7 +448,7 @@ def _appliance_info_finder(self, appliance: etree, appl: Munch) -> Munch: return appl - # Collect info from Stretches - BOUWEW only needed for Stretches? + # Collect info from power-related devices appl = self._energy_device_info_finder(appliance, appl) return appl From 9be070f0d5730fef167625d66a5e8b7e11f494ad Mon Sep 17 00:00:00 2001 From: Bouwe Date: Mon, 1 Jan 2024 15:32:05 +0100 Subject: [PATCH 021/306] Solve remaining question, only needed for Stretch --- plugwise/helper.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/plugwise/helper.py b/plugwise/helper.py index fc925505e..e2c406ce8 100644 --- a/plugwise/helper.py +++ b/plugwise/helper.py @@ -327,9 +327,6 @@ def _energy_device_info_finder(self, appliance: etree, appl: Munch) -> Munch: appl.hardware = module_data["hardware_version"] appl.model = module_data["vendor_model"] appl.vendor_name = module_data["vendor_name"] - if appl.hardware is not None: # BOUWEW only Stretch-related? - hw_version = appl.hardware.replace("-", "") - appl.model = version_to_model(hw_version) appl.firmware = module_data["firmware_version"] return appl From 195ab392ada95b7e3adee9db167215618954a2a6 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Mon, 1 Jan 2024 15:37:54 +0100 Subject: [PATCH 022/306] Extend comment --- plugwise/helper.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugwise/helper.py b/plugwise/helper.py index e2c406ce8..57d349b61 100644 --- a/plugwise/helper.py +++ b/plugwise/helper.py @@ -321,7 +321,6 @@ def _energy_device_info_finder(self, appliance: etree, appl: Munch) -> Munch: if self.smile_type == "power": locator = "./logs/point_log/electricity_point_meter" mod_type = "electricity_point_meter" - module_data = self._get_module_data(appliance, locator, mod_type) appl.zigbee_mac = module_data["zigbee_mac_address"] appl.hardware = module_data["hardware_version"] @@ -445,7 +444,7 @@ def _appliance_info_finder(self, appliance: etree, appl: Munch) -> Munch: return appl - # Collect info from power-related devices + # Collect info from power-related devices (Plug, Aqara Smart Plug) appl = self._energy_device_info_finder(appliance, appl) return appl From 73b5e589594525dede7d6810d2056035f5e41ebc Mon Sep 17 00:00:00 2001 From: autoruff Date: Mon, 1 Jan 2024 14:39:23 +0000 Subject: [PATCH 023/306] fixup: split_legacy Python code fixed using ruff --- plugwise/helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugwise/helper.py b/plugwise/helper.py index 57d349b61..b6f05d197 100644 --- a/plugwise/helper.py +++ b/plugwise/helper.py @@ -444,7 +444,7 @@ def _appliance_info_finder(self, appliance: etree, appl: Munch) -> Munch: return appl - # Collect info from power-related devices (Plug, Aqara Smart Plug) + # Collect info from power-related devices (Plug, Aqara Smart Plug) appl = self._energy_device_info_finder(appliance, appl) return appl From cf8f9ef73ce7b12c987e30f91b2c397283cd22bb Mon Sep 17 00:00:00 2001 From: Bouwe Date: Tue, 2 Jan 2024 12:31:42 +0100 Subject: [PATCH 024/306] Fix valve assert Fix 2 Fix 3 Fix 4 Fix 5 Fix 6 --- tests/data/adam/adam_heatpump_cooling.json | 2 +- tests/data/adam/adam_multiple_devices_per_zone.json | 2 +- tests/data/adam/adam_onoff_cooling_fake_firmware.json | 2 +- tests/data/adam/adam_zone_per_device.json | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/data/adam/adam_heatpump_cooling.json b/tests/data/adam/adam_heatpump_cooling.json index 77cd4533b..7cac31cbc 100644 --- a/tests/data/adam/adam_heatpump_cooling.json +++ b/tests/data/adam/adam_heatpump_cooling.json @@ -3,7 +3,7 @@ "available": true, "binary_sensors": { "cooling_state": false, - "dhw_state": false, + "dhw_state": true, "flame_state": false, "heating_state": false }, diff --git a/tests/data/adam/adam_multiple_devices_per_zone.json b/tests/data/adam/adam_multiple_devices_per_zone.json index c719bb33e..6821ad6ba 100644 --- a/tests/data/adam/adam_multiple_devices_per_zone.json +++ b/tests/data/adam/adam_multiple_devices_per_zone.json @@ -148,7 +148,7 @@ "vendor": "Plugwise", "available": true, "sensors": { - "electricity_consumed": 82.6, + "electricity_consumed": 84.1, "electricity_consumed_interval": 8.6, "electricity_produced": 0, "electricity_produced_interval": 0 diff --git a/tests/data/adam/adam_onoff_cooling_fake_firmware.json b/tests/data/adam/adam_onoff_cooling_fake_firmware.json index 323ea9bb7..1c3dac0e0 100644 --- a/tests/data/adam/adam_onoff_cooling_fake_firmware.json +++ b/tests/data/adam/adam_onoff_cooling_fake_firmware.json @@ -2,7 +2,7 @@ "0ca13e8176204ca7bf6f09de59f81c83": { "binary_sensors": { "cooling_state": true, - "dhw_state": false, + "dhw_state": true, "heating_state": false }, "sensors": { diff --git a/tests/data/adam/adam_zone_per_device.json b/tests/data/adam/adam_zone_per_device.json index e3f3cfaad..8dc264361 100644 --- a/tests/data/adam/adam_zone_per_device.json +++ b/tests/data/adam/adam_zone_per_device.json @@ -47,7 +47,7 @@ "temperature": 26.2, "setpoint": 21.5, "temperature_difference": 3.7, - "valve_position": 0 + "valve_position": 100 } }, "a2c3583e0a6349358998b760cea82d2a": { @@ -148,7 +148,7 @@ "vendor": "Plugwise", "available": true, "sensors": { - "electricity_consumed": 81.2, + "electricity_consumed": 80.1, "electricity_consumed_interval": 12.7, "electricity_produced": 0, "electricity_produced_interval": 0 @@ -183,7 +183,7 @@ "model": "Unknown", "name": "OnOff", "binary_sensors": { - "heating_state": false + "heating_state": true }, "sensors": { "water_temperature": 70, From 1d16de47cf6b35c1ca84fb5513b4f0a893cbd4c0 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Tue, 2 Jan 2024 12:39:38 +0100 Subject: [PATCH 025/306] Clear domain_objects like appliances --- .../core.domain_objects.xml | 1397 +---------------- 1 file changed, 7 insertions(+), 1390 deletions(-) diff --git a/userdata/adam_onoff_cooling_fake_firmware/core.domain_objects.xml b/userdata/adam_onoff_cooling_fake_firmware/core.domain_objects.xml index e2651a118..42709e92b 100644 --- a/userdata/adam_onoff_cooling_fake_firmware/core.domain_objects.xml +++ b/userdata/adam_onoff_cooling_fake_firmware/core.domain_objects.xml @@ -223,144 +223,6 @@ - - Thermostaat SQ - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2020-10-27T21:08:54.651+01:00 - 2021-12-31T13:46:54.988+01:00 - - - - - - temperature - C - 2021-12-31T13:46:54.985+01:00 - 2021-12-31T13:46:54.985+01:00 - PT3H - - - 21.40 - - - - thermostat - C - 2021-12-31T01:55:13.767+01:00 - 2021-12-16T13:35:09.039+01:00 - - - - 18.50 - - - - temperature_offset - C - 2020-10-27T21:08:59.077+01:00 - 2020-10-27T21:08:58.784+01:00 - - - - 0.00 - - - - - - - 2020-10-27T21:08:59.077+01:00 - temperature_offset - 0 - - - 2021-12-31T01:55:13.767+01:00 - thermostat - 18.5 - 0 - 99.9 - 0.01 - - - - - - - Smart Plug JM - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-11-02T21:24:39.151+01:00 - 2021-12-31T13:39:38.249+01:00 - - - - - - electricity_consumed - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - relay - - 2021-12-31T13:39:38.246+01:00 - 2021-12-23T13:10:21.147+01:00 - - - - off - - - - electricity_produced - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - electricity_consumed - W - 2021-12-31T13:25:16.545+01:00 - 2021-12-23T13:10:33.630+01:00 - - - - 0.00 - - - - electricity_produced - W - 2021-12-31T13:25:16.545+01:00 - 2020-11-03T05:40:37.085+01:00 - - - - 0.00 - - - - - - 2021-12-31T13:39:38.246+01:00 - false - off - - - - Plugwise 158-01 @@ -395,81 +257,6 @@ - - Smart Plug KK - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-10-30T10:24:39.251+01:00 - 2021-12-31T13:41:39.980+01:00 - - - - - - electricity_produced - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - electricity_consumed - W - 2021-12-31T13:29:46.944+01:00 - 2021-12-31T08:08:26.977+01:00 - - - - 2.13 - - - - electricity_produced - W - 2021-12-31T13:29:46.944+01:00 - 2020-10-30T16:13:18.696+01:00 - - - - 0.00 - - - - electricity_consumed - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - relay - - 2021-12-31T13:38:47.663+01:00 - 2021-12-31T07:48:16.655+01:00 - - - - on - - - - - - 2021-12-31T13:38:47.663+01:00 - false - on - - - - Home @@ -539,50 +326,6 @@ - - ZigBee InnrE - A device that communicates through the ZigBee protocol. - heater_electric - 2021-02-12T17:01:14.713+01:00 - 2021-12-02T21:48:35.292+01:00 - - - - - electricity_consumed - Wh - 2021-12-02T12:00:00+01:00 - 2021-12-02T11:45:00+01:00 - PT15M - - 0.00 - - - - electricity_produced - Wh - - - PT15M - - - relay - - 2021-12-02T12:00:51.301+01:00 - 2021-12-01T08:13:20.343+01:00 - - - off - - - - - - 2021-12-02T12:00:51.301+01:00 - false - - - Thermostat presets Provides presets for a Location. @@ -759,156 +502,6 @@ - - Smart Plug BK2 - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-11-02T18:04:00.035+01:00 - 2021-12-31T13:48:02.942+01:00 - - - - - - electricity_produced - Wh - 2021-12-31T13:45:00+01:00 - 2021-12-31T13:30:00+01:00 - PT15M - - - 0.00 - - - - relay - - 2021-12-31T13:48:02.940+01:00 - 2021-12-26T04:30:22.278+01:00 - - - - off - - - - electricity_produced - W - 2021-12-31T13:33:43.042+01:00 - 2020-11-02T18:04:06.479+01:00 - - - - 0.00 - - - - electricity_consumed - Wh - 2021-12-31T13:45:00+01:00 - 2021-12-31T13:30:00+01:00 - PT15M - - - 0.00 - - - - electricity_consumed - W - 2021-12-31T13:33:43.042+01:00 - 2021-12-26T04:30:35.520+01:00 - - - - 0.00 - - - - - - 2021-12-31T13:48:02.940+01:00 - false - off - - - - - - Smart Plug BK - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-11-02T16:53:27.781+01:00 - 2021-12-31T13:48:34.921+01:00 - - - - - - relay - - 2021-12-31T13:37:43.493+01:00 - 2021-12-31T01:45:24.928+01:00 - - - - off - - - - electricity_produced - Wh - 2021-12-31T13:45:00+01:00 - 2021-12-31T13:30:00+01:00 - PT15M - - - 0.00 - - - - electricity_consumed - W - 2021-12-31T13:37:55.350+01:00 - 2021-12-31T01:45:36.455+01:00 - - - - 0.00 - - - - electricity_consumed - Wh - 2021-12-31T13:45:00+01:00 - 2021-12-31T13:30:00+01:00 - PT15M - - - 0.00 - - - - electricity_produced - W - 2021-12-31T13:37:55.350+01:00 - 2020-11-02T16:53:32.263+01:00 - - - - 0.00 - - - - - - 2021-12-31T13:37:43.493+01:00 - false - off - - - - Plugwise 158-01 @@ -1044,206 +637,6 @@ - - Thermostaat BK1 - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2020-10-27T21:07:24.125+01:00 - 2021-12-31T13:38:34.576+01:00 - - - - - - thermostat - C - 2021-12-31T05:26:35.148+01:00 - 2021-12-23T17:15:00.709+01:00 - - - - 20.50 - - - - temperature_offset - C - 2020-10-27T21:07:28.892+01:00 - 2020-10-27T21:07:28.676+01:00 - - - - 0.00 - - - - temperature - C - 2021-12-31T13:38:34.574+01:00 - 2021-12-31T13:38:34.574+01:00 - PT3H - - - 21.50 - - - - - - - 2020-10-27T21:07:28.892+01:00 - temperature_offset - 0 - - - 2021-12-31T05:26:35.148+01:00 - thermostat - 20.5 - 0 - 99.9 - 0.01 - - - - - - - Thermostaat KK - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2020-10-27T09:22:32.346+01:00 - 2021-12-31T13:48:14.157+01:00 - - - - - - temperature_offset - C - 2021-12-25T07:30:46.661+01:00 - 2021-02-17T12:31:50.397+01:00 - - - - 0.00 - - - - temperature - C - 2021-12-31T13:48:14.155+01:00 - 2021-12-31T13:48:14.155+01:00 - PT3H - - - 22.50 - - - - thermostat - C - 2021-12-31T03:04:32.792+01:00 - 2021-12-20T13:34:07.924+01:00 - - - - 21.50 - - - - battery - - 2021-12-31T06:58:15.453+01:00 - 2021-12-27T18:24:04.650+01:00 - - - - 0.53 - - - - - - - 2021-12-25T07:30:46.661+01:00 - temperature_offset - 0 - - - 2021-12-31T03:04:32.792+01:00 - thermostat - 21.5 - 0 - 99.9 - 0.01 - - - - - - - Thermostaat SJ - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2020-10-26T20:25:18.277+01:00 - 2021-12-31T13:48:17.701+01:00 - - - - - - temperature_offset - C - 2020-10-26T20:25:21.413+01:00 - 2020-10-26T20:25:21.198+01:00 - - - - 0.00 - - - - temperature - C - 2021-12-31T13:48:17.698+01:00 - 2021-12-31T13:48:17.698+01:00 - PT3H - - - 22.60 - - - - thermostat - C - 2021-12-31T12:08:28.156+01:00 - 2021-12-21T11:53:40.255+01:00 - - - - 20.50 - - - - - - 2021-12-31T12:08:28.156+01:00 - thermostat - 20.5 - 0 - 99.9 - 0.01 - - - - - - 2020-10-26T20:25:21.413+01:00 - temperature_offset - 0 - - - Plugwise 160-01 @@ -1404,69 +797,6 @@ - - Thermostaat RB - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2020-10-28T15:07:25.005+01:00 - 2021-12-31T13:48:46.497+01:00 - - - - - - thermostat - C - 2021-12-31T03:48:02.736+01:00 - 2021-12-29T15:47:23.817+01:00 - - - - 17.00 - - - - temperature - C - 2021-12-31T13:48:46.492+01:00 - 2021-12-31T13:48:46.492+01:00 - PT3H - - - 20.70 - - - - temperature_offset - C - 2020-10-28T15:07:33.735+01:00 - 2020-10-28T15:07:33.280+01:00 - - - - 0.00 - - - - - - - 2020-10-28T15:07:33.735+01:00 - temperature_offset - 0 - - - 2021-12-31T03:48:02.736+01:00 - thermostat - 17 - 0 - 99.9 - 0.01 - - - - - Thermostat presets Provides presets for a Location. @@ -1994,163 +1324,13 @@ - - - - - - - - - Smart Plug SJ - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-11-03T11:13:01.015+01:00 - 2021-12-31T13:46:26.498+01:00 - - - - - - electricity_consumed - W - 2021-12-31T13:46:26.306+01:00 - 2020-11-03T11:13:07.884+01:00 - - - - 0.00 - - - - relay - - 2021-12-31T13:42:29.874+01:00 - 2021-12-24T08:10:18.755+01:00 - - - - off - - - - electricity_consumed - Wh - 2021-12-31T13:45:00+01:00 - 2021-12-31T13:30:00+01:00 - PT15M - - - 0.00 - - - - electricity_produced - W - 2021-12-31T13:46:26.306+01:00 - 2020-11-03T11:13:07.884+01:00 - - - - 0.00 - - - - electricity_produced - Wh - 2021-12-31T13:45:00+01:00 - 2021-12-31T13:30:00+01:00 - PT15M - - - 0.00 - - - - - - 2021-12-31T13:42:29.874+01:00 - false - off - - - - - - Smart Plug WK - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-11-02T16:16:28.852+01:00 - 2021-12-31T13:37:44.618+01:00 - - - - - - relay - - 2021-12-31T13:36:41.362+01:00 - 2021-12-31T07:48:16.675+01:00 - - - - off - - - - electricity_produced - W - 2021-12-31T13:36:58.429+01:00 - 2021-02-01T17:01:59.051+01:00 - - - - 0.00 - - - - electricity_produced - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - electricity_consumed - W - 2021-12-31T13:36:58.429+01:00 - 2021-12-31T07:48:33.204+01:00 - - - - 0.00 - - - - electricity_consumed - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - - - 2021-12-31T13:36:41.362+01:00 - false - off - - - - + + + + + + + Weekend @@ -2247,69 +1427,6 @@ - - Thermostaat BK2 - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2020-10-27T21:13:47.703+01:00 - 2021-12-31T13:43:08.362+01:00 - - - - - - temperature_offset - C - 2020-10-27T21:13:52.473+01:00 - 2020-10-27T21:13:52.209+01:00 - - - - 0.00 - - - - thermostat - C - 2021-12-31T01:57:38.409+01:00 - 2021-12-16T13:35:09.082+01:00 - - - - 20.50 - - - - temperature - C - 2021-12-31T13:43:08.360+01:00 - 2021-12-31T13:43:08.360+01:00 - PT3H - - - 21.90 - - - - - - 2021-12-31T01:57:38.409+01:00 - thermostat - 20.5 - 0 - 99.9 - 0.01 - - - - - - 2020-10-27T21:13:52.473+01:00 - temperature_offset - 0 - - - Plugwise 160-01 @@ -2467,132 +1584,6 @@ - - Thermostaat DB - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2020-10-28T15:14:08.541+01:00 - 2021-12-31T13:35:34.784+01:00 - - - - - - temperature - C - 2021-12-31T13:35:34.781+01:00 - 2021-12-31T13:35:34.781+01:00 - PT3H - - - 22.00 - - - - thermostat - C - 2021-12-31T03:21:00.142+01:00 - 2021-12-22T09:29:44.600+01:00 - - - - 18.00 - - - - temperature_offset - C - 2020-10-28T15:14:14.167+01:00 - 2020-10-28T15:14:13.847+01:00 - - - - 0.00 - - - - - - - 2020-10-28T15:14:14.167+01:00 - temperature_offset - 0 - - - 2021-12-31T03:21:00.142+01:00 - thermostat - 18 - 0 - 99.9 - 0.01 - - - - - - - Thermostaat JM - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2020-10-28T16:02:36.260+01:00 - 2021-12-31T13:42:47.867+01:00 - - - - - - temperature_offset - C - 2020-10-28T16:02:42.372+01:00 - 2020-10-28T16:02:42.073+01:00 - - - - 0.00 - - - - thermostat - C - 2021-12-31T01:56:24.596+01:00 - 2021-12-16T13:34:45.084+01:00 - - - - 18.00 - - - - temperature - C - 2021-12-31T13:42:47.865+01:00 - 2021-12-31T13:42:47.865+01:00 - PT3H - - - 20.00 - - - - - - 2021-12-31T01:56:24.596+01:00 - thermostat - 18 - 0 - 99.9 - 0.01 - - - - - - 2020-10-28T16:02:42.372+01:00 - temperature_offset - 0 - - - Thermostat presets Provides presets for a Location. @@ -2728,80 +1719,6 @@ - - Thermostaat BK - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2020-10-28T14:59:20.005+01:00 - 2021-12-31T13:45:19.003+01:00 - - - - - - thermostat - C - 2021-12-31T08:00:03.239+01:00 - 2021-12-31T08:00:03.203+01:00 - - - - 18.00 - - - - temperature_offset - C - 2021-12-24T19:54:18.015+01:00 - 2020-11-08T09:57:03.288+01:00 - - - - 0.00 - - - - battery - - 2021-12-31T04:37:36.270+01:00 - 2021-12-30T16:44:07.154+01:00 - - - - 0.55 - - - - temperature - C - 2021-12-31T13:45:19.001+01:00 - 2021-12-31T13:45:19.001+01:00 - PT3H - - - 18.80 - - - - - - 2021-12-31T08:00:03.239+01:00 - thermostat - 18 - 0 - 99.9 - 0.01 - - - - - - 2021-12-24T19:54:18.015+01:00 - temperature_offset - 0 - - - Central heating boiler @@ -3380,156 +2297,6 @@ - - Smart Plug RB - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-11-03T10:15:11.482+01:00 - 2021-12-31T13:41:14.111+01:00 - - - - - - electricity_produced - W - 2021-12-31T13:35:33.050+01:00 - 2020-11-03T10:15:17.904+01:00 - - - - 0.00 - - - - electricity_consumed - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.77 - - - - electricity_consumed - W - 2021-12-31T13:35:33.050+01:00 - 2021-12-29T07:30:55.567+01:00 - - - - 3.13 - - - - relay - - 2021-12-31T13:41:14.086+01:00 - 2021-12-22T09:30:16.696+01:00 - - - - off - - - - electricity_produced - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - - - 2021-12-31T13:41:14.086+01:00 - false - off - - - - - - Smart Plug BK1 - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-11-02T18:00:12.397+01:00 - 2021-12-31T13:46:58.916+01:00 - - - - - - electricity_consumed - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - relay - - 2021-12-31T13:46:58.905+01:00 - 2021-12-30T22:59:06.073+01:00 - - - - off - - - - electricity_consumed - W - 2021-12-31T13:32:34.226+01:00 - 2021-12-30T22:59:14.417+01:00 - - - - 0.00 - - - - electricity_produced - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - electricity_produced - W - 2021-12-31T13:32:34.226+01:00 - 2020-11-03T05:40:42.108+01:00 - - - - 0.00 - - - - - - 2021-12-31T13:46:58.905+01:00 - false - off - - - - Plugwise 158-01 @@ -3924,156 +2691,6 @@ - - Smart Plug DB - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-11-03T10:12:24.094+01:00 - 2021-12-31T13:36:32.111+01:00 - - - - - - electricity_produced - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - electricity_produced - W - 2021-12-31T13:22:13.396+01:00 - 2020-11-03T10:12:30.451+01:00 - - - - 0.00 - - - - electricity_consumed - W - 2021-12-31T13:22:13.396+01:00 - 2021-12-26T01:00:36.730+01:00 - - - - 0.00 - - - - electricity_consumed - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - relay - - 2021-12-31T13:36:32.108+01:00 - 2021-12-26T01:00:21.033+01:00 - - - - off - - - - - - 2021-12-31T13:36:32.108+01:00 - false - off - - - - - - Smart Plug SQ - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-10-26T19:54:10.743+01:00 - 2021-12-31T13:37:34.007+01:00 - - - - - - electricity_consumed - W - 2021-12-31T13:23:10.582+01:00 - 2021-12-22T14:35:59.086+01:00 - - - - 0.00 - - - - electricity_produced - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - relay - - 2021-12-31T13:37:34.002+01:00 - 2021-12-22T14:35:49.869+01:00 - - - - off - - - - electricity_produced - W - 2021-12-31T13:23:10.582+01:00 - 2020-10-26T19:54:12.834+01:00 - - - - 0.00 - - - - electricity_consumed - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - - - 2021-12-31T13:37:34.002+01:00 - false - off - - - - Plugwise 106-03 From 39098532d87efb37ecaf7be274114e56cb157649 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Tue, 2 Jan 2024 12:45:16 +0100 Subject: [PATCH 026/306] Fix 7 Remove name Fix 8 --- tests/data/adam/adam_plus_anna.json | 4 ++-- userdata/adam_plus_anna/core.domain_objects.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/data/adam/adam_plus_anna.json b/tests/data/adam/adam_plus_anna.json index 087484ef4..dfbcaf367 100644 --- a/tests/data/adam/adam_plus_anna.json +++ b/tests/data/adam/adam_plus_anna.json @@ -17,7 +17,7 @@ "flame_state": false }, "sensors": { - "water_temperature": 47, + "water_temperature": 48, "intended_boiler_temperature": 0 }, "switches": { @@ -93,7 +93,7 @@ "vendor": "Plugwise", "available": true, "sensors": { - "electricity_consumed": 79.8, + "electricity_consumed": 80.5, "electricity_consumed_interval": 7.03, "electricity_produced": 0, "electricity_produced_interval": 0 diff --git a/userdata/adam_plus_anna/core.domain_objects.xml b/userdata/adam_plus_anna/core.domain_objects.xml index d44e87dd9..fc828d838 100644 --- a/userdata/adam_plus_anna/core.domain_objects.xml +++ b/userdata/adam_plus_anna/core.domain_objects.xml @@ -1138,7 +1138,7 @@ - Bouwe-PC + Work-PC A smart plug that can be switched on/off and measure power usage. computer_desktop 2020-02-29T22:56:59.235+01:00 From 4217bd981a73c0a9ebac1a0b405c0b1c9ee7e3a4 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Tue, 2 Jan 2024 12:55:05 +0100 Subject: [PATCH 027/306] Remove vendor-model for test-coverage --- userdata/adam_plus_anna/core.domain_objects.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userdata/adam_plus_anna/core.domain_objects.xml b/userdata/adam_plus_anna/core.domain_objects.xml index fc828d838..370fcfeed 100644 --- a/userdata/adam_plus_anna/core.domain_objects.xml +++ b/userdata/adam_plus_anna/core.domain_objects.xml @@ -108,7 +108,7 @@ Plugwise - 160-01 + 2019-06-21T02:00:00+02:00 2020-02-29T22:56:58.823+01:00 From abcaa33f52b5f689225045f073c7d7d0109ac5c3 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Tue, 2 Jan 2024 13:15:17 +0100 Subject: [PATCH 028/306] Remove test_connect_adam_plus_anna_copy_with_error_domain_added --- tests/test_adam.py | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/tests/test_adam.py b/tests/test_adam.py index 90898e550..81c0c8add 100644 --- a/tests/test_adam.py +++ b/tests/test_adam.py @@ -221,34 +221,6 @@ async def test_connect_adam_plus_anna(self): await smile.close_connection() await self.disconnect(server, client) - @pytest.mark.asyncio - async def test_connect_adam_plus_anna_copy_with_error_domain_added(self): - """Test erroneous domain_objects file from user.""" - testdata = { - # Central - "2743216f626f43948deec1f7ab3b3d70": { - "binary_sensors": {"heating_state": False}, - }, - } - - self.smile_setup = "adam_plus_anna_copy_with_error_domain_added" - server, smile, client = await self.connect_wrapper() - assert smile.smile_hostname == "smile000000" - - self.validate_test_basics( - _LOGGER, - smile, - smile_version="3.0.23", - ) - - await self.device_test(smile, "2020-03-22 00:00:01", testdata) - assert smile.device_items == 70 - - assert "3d28a20e17cb47dca210a132463721d5" in self.notifications - - await smile.close_connection() - await self.disconnect(server, client) - @pytest.mark.asyncio async def test_connect_adam_plus_anna_new(self): """Test extended Adam (firmware 3.8) with Anna and a switch-group setup.""" From 21dc32b6581dd0f357bc520601c6d4f899556edd Mon Sep 17 00:00:00 2001 From: Bouwe Date: Tue, 2 Jan 2024 13:17:24 +0100 Subject: [PATCH 029/306] Add Aqara Smart Plug appliance to domain_objects --- .../core.domain_objects.xml | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/userdata/adam_plus_anna_new/core.domain_objects.xml b/userdata/adam_plus_anna_new/core.domain_objects.xml index 641155d6f..fb0e593a0 100644 --- a/userdata/adam_plus_anna_new/core.domain_objects.xml +++ b/userdata/adam_plus_anna_new/core.domain_objects.xml @@ -1,5 +1,56 @@ + + SmartPlug Floor 0 + A device that communicates through the ZigBee protocol. + 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 + + + + + + electricity_consumed + Wh + 2023-12-22T16:15:00+01:00 + 2023-12-22T16:00:00+01:00 + PT15M + + + 0.00 + + + + electricity_produced + Wh + + + PT15M + + + + relay + + 2023-12-22T16:18:09.841+01:00 + 2022-06-11T15:25:12.796+02:00 + + + + on + + + + + + 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). From 7241d7fe17f984d967a4c3d68be089d64eb79c4b Mon Sep 17 00:00:00 2001 From: Bouwe Date: Tue, 2 Jan 2024 13:18:28 +0100 Subject: [PATCH 030/306] Fix 9 --- tests/data/adam/adam_plus_anna_new.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/adam/adam_plus_anna_new.json b/tests/data/adam/adam_plus_anna_new.json index a2abd77f0..4e7d35912 100644 --- a/tests/data/adam/adam_plus_anna_new.json +++ b/tests/data/adam/adam_plus_anna_new.json @@ -31,7 +31,7 @@ "flame_state": true }, "sensors": { - "water_temperature": 29, + "water_temperature": 30, "intended_boiler_temperature": 20 }, "switches": { From 6a73155d293436d3587b42c94a77a36815ce2b11 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Tue, 2 Jan 2024 13:19:32 +0100 Subject: [PATCH 031/306] Fix 10 --- fixtures/adam_heatpump_cooling/all_data.json | 88 ++++++++++++++++--- .../adam_heatpump_cooling/device_list.json | 28 +++--- .../all_data.json | 42 +++++++-- .../device_list.json | 20 ++--- .../all_data.json | 18 +++- fixtures/adam_plus_anna/all_data.json | 17 +++- fixtures/adam_plus_anna/device_list.json | 2 +- fixtures/adam_plus_anna_new/all_data.json | 59 +++++++------ fixtures/adam_plus_anna_new/device_list.json | 5 +- fixtures/adam_zone_per_device/all_data.json | 46 ++++++++-- .../adam_zone_per_device/device_list.json | 20 ++--- tests/data/adam/adam_plus_anna_new.json | 2 +- 12 files changed, 247 insertions(+), 100 deletions(-) diff --git a/fixtures/adam_heatpump_cooling/all_data.json b/fixtures/adam_heatpump_cooling/all_data.json index 7f1685894..3d8843816 100644 --- a/fixtures/adam_heatpump_cooling/all_data.json +++ b/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 }, @@ -55,7 +55,13 @@ "mode": "cool", "model": "Lisa", "name": "Thermostaat BK", - "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], + "preset_modes": [ + "no_frost", + "vacation", + "away", + "home", + "asleep" + ], "select_schedule": "off", "sensors": { "battery": 55, @@ -170,7 +176,13 @@ "mode": "cool", "model": "Lisa", "name": "Thermostaat DB", - "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], + "preset_modes": [ + "no_frost", + "vacation", + "away", + "home", + "asleep" + ], "select_schedule": "off", "sensors": { "setpoint": 18.0, @@ -216,7 +228,11 @@ }, "dev_class": "gateway", "firmware": "3.2.8", - "gateway_modes": ["away", "full", "vacation"], + "gateway_modes": [ + "away", + "full", + "vacation" + ], "hardware": "AME Smile 2.0 board", "location": "eedadcb297564f1483faa509179aebed", "mac_address": "012345670001", @@ -254,7 +270,13 @@ "mode": "cool", "model": "Lisa", "name": "Thermostaat JM", - "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], + "preset_modes": [ + "no_frost", + "vacation", + "away", + "home", + "asleep" + ], "select_schedule": "off", "sensors": { "setpoint": 18.0, @@ -387,7 +409,13 @@ "mode": "cool", "model": "Lisa", "name": "Thermostaat SQ", - "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], + "preset_modes": [ + "no_frost", + "vacation", + "away", + "home", + "asleep" + ], "select_schedule": "off", "sensors": { "setpoint": 18.5, @@ -425,7 +453,13 @@ "mode": "cool", "model": "Lisa", "name": "Thermostaat RB", - "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], + "preset_modes": [ + "no_frost", + "vacation", + "away", + "home", + "asleep" + ], "select_schedule": "off", "sensors": { "setpoint": 17.0, @@ -460,7 +494,13 @@ "mode": "auto", "model": "ThermoTouch", "name": "Thermostaat WK", - "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], + "preset_modes": [ + "no_frost", + "vacation", + "away", + "home", + "asleep" + ], "select_schedule": "Werkdag schema", "sensors": { "setpoint": 21.5, @@ -491,7 +531,13 @@ "mode": "cool", "model": "Lisa", "name": "Thermostaat SJ", - "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], + "preset_modes": [ + "no_frost", + "vacation", + "away", + "home", + "asleep" + ], "select_schedule": "off", "sensors": { "setpoint": 20.5, @@ -529,7 +575,13 @@ "mode": "auto", "model": "Lisa", "name": "Thermostaat KK", - "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], + "preset_modes": [ + "no_frost", + "vacation", + "away", + "home", + "asleep" + ], "select_schedule": "Werkdag schema", "sensors": { "battery": 53, @@ -568,7 +620,13 @@ "mode": "auto", "model": "Lisa", "name": "Thermostaat BK1", - "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], + "preset_modes": [ + "no_frost", + "vacation", + "away", + "home", + "asleep" + ], "select_schedule": "Werkdag schema", "sensors": { "setpoint": 20.5, @@ -606,7 +664,13 @@ "mode": "auto", "model": "Lisa", "name": "Thermostaat BK2", - "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], + "preset_modes": [ + "no_frost", + "vacation", + "away", + "home", + "asleep" + ], "select_schedule": "Werkdag schema", "sensors": { "setpoint": 20.5, diff --git a/fixtures/adam_heatpump_cooling/device_list.json b/fixtures/adam_heatpump_cooling/device_list.json index a712cb97f..8357beb4e 100644 --- a/fixtures/adam_heatpump_cooling/device_list.json +++ b/fixtures/adam_heatpump_cooling/device_list.json @@ -1,24 +1,24 @@ [ "7d97fc3117784cfdafe347bcedcbbbcb", "0ca13e8176204ca7bf6f09de59f81c83", - "1053c8bbf8be43c6921742b146a625f1", - "a03b6e8e76dd4646af1a77c31dd9370c", - "bbcffa48019f4b09b8368bbaf9559e68", - "f04c985c11ad4848b8fcd710343f9dcf", - "2e0fc4db2a6d4cbeb7cf786143543961", - "3f0afa71f16c45ab964050002560e43c", - "ca79d23ae0094120b877558734cff85c", - "838c2f48195242709b87217cf8d8a71f", - "c4ed311d54e341f58b4cdd201d1fde7e", - "eac5db95d97241f6b17790897847ccf5", "beb32da072274e698146db8b022f3c36", "96714ad90fc948bcbcb5021c4b9f5ae9", - "3b4d2574e2c9443a832b48d19a1c4f06", - "5ead63c65e5f44e7870ba2bd680ceb9e", - "1a27dd03b5454c4e8b9e75c8d1afc7af", + "2e0fc4db2a6d4cbeb7cf786143543961", "8a482fa9dddb43acb765d019d8c9838b", + "838c2f48195242709b87217cf8d8a71f", + "eac5db95d97241f6b17790897847ccf5", "ea8372c0e3ad4622ad45a041d02425f5", "d3a276aeb3114a509bab1e4bf8c40348", + "c4ed311d54e341f58b4cdd201d1fde7e", + "3b4d2574e2c9443a832b48d19a1c4f06", + "3f0afa71f16c45ab964050002560e43c", + "ca79d23ae0094120b877558734cff85c", + "f04c985c11ad4848b8fcd710343f9dcf", "47e2c550a33846b680725aa3fb229473", - "7fda9f84f01342f8afe9ebbbbff30c0f" + "7fda9f84f01342f8afe9ebbbbff30c0f", + "1053c8bbf8be43c6921742b146a625f1", + "a03b6e8e76dd4646af1a77c31dd9370c", + "bbcffa48019f4b09b8368bbaf9559e68", + "1a27dd03b5454c4e8b9e75c8d1afc7af", + "5ead63c65e5f44e7870ba2bd680ceb9e" ] diff --git a/fixtures/adam_multiple_devices_per_zone/all_data.json b/fixtures/adam_multiple_devices_per_zone/all_data.json index f97182782..557062e1b 100644 --- a/fixtures/adam_multiple_devices_per_zone/all_data.json +++ b/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 @@ -122,7 +122,13 @@ "mode": "auto", "model": "Lisa", "name": "Zone Thermostat Jessie", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": [ + "home", + "asleep", + "away", + "vacation", + "no_frost" + ], "select_schedule": "CV Jessie", "sensors": { "battery": 37, @@ -262,7 +268,13 @@ "mode": "auto", "model": "Lisa", "name": "Zone Lisa WK", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": [ + "home", + "asleep", + "away", + "vacation", + "no_frost" + ], "select_schedule": "GF7 Woonkamer", "sensors": { "battery": 34, @@ -346,7 +358,13 @@ "mode": "heat", "model": "Lisa", "name": "Zone Lisa Bios", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": [ + "home", + "asleep", + "away", + "vacation", + "no_frost" + ], "select_schedule": "off", "sensors": { "battery": 67, @@ -386,7 +404,13 @@ "mode": "heat", "model": "Tom/Floor", "name": "CV Kraan Garage", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": [ + "home", + "asleep", + "away", + "vacation", + "no_frost" + ], "select_schedule": "off", "sensors": { "battery": 68, @@ -428,7 +452,13 @@ "mode": "auto", "model": "Lisa", "name": "Zone Thermostat Badkamer", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": [ + "home", + "asleep", + "away", + "vacation", + "no_frost" + ], "select_schedule": "Badkamer Schema", "sensors": { "battery": 92, diff --git a/fixtures/adam_multiple_devices_per_zone/device_list.json b/fixtures/adam_multiple_devices_per_zone/device_list.json index 104a723e4..606a1ce20 100644 --- a/fixtures/adam_multiple_devices_per_zone/device_list.json +++ b/fixtures/adam_multiple_devices_per_zone/device_list.json @@ -1,20 +1,20 @@ [ "fe799307f1624099878210aa0b9f1475", "90986d591dcd426cae3ec3e8111ff730", - "df4a4a8169904cdb9c03d61a21f42140", - "b310b72a0e354bfab43089919b9a88bf", - "a2c3583e0a6349358998b760cea82d2a", "b59bcebaf94b499ea7d46e4a66fb62d8", "d3da73bde12a47d5a6b8f9dad971f2ec", - "21f2b542c49845e6bb416884c55778d6", - "78d1126fc4c743db81b61c20e88342a7", "cd0ddb54ef694e11ac18ed1cbce5dbbd", - "4a810418d5394b3f82727340b91ba740", - "02cf28bfec924855854c544690a609ef", - "a28f588dc4a049a483fd03a30361ad3a", "6a3bf693d05e48e0b460c815a4fdd09d", - "680423ff840043738f42cc7f1ff97a36", + "21f2b542c49845e6bb416884c55778d6", + "b310b72a0e354bfab43089919b9a88bf", + "a2c3583e0a6349358998b760cea82d2a", + "02cf28bfec924855854c544690a609ef", "f1fee6043d3642a9b0a65297455f008e", + "680423ff840043738f42cc7f1ff97a36", + "e7693eb9582644e5b865dba8d4447cf1", + "df4a4a8169904cdb9c03d61a21f42140", "675416a629f343c495449970e2ca37b5", - "e7693eb9582644e5b865dba8d4447cf1" + "4a810418d5394b3f82727340b91ba740", + "a28f588dc4a049a483fd03a30361ad3a", + "78d1126fc4c743db81b61c20e88342a7" ] diff --git a/fixtures/adam_onoff_cooling_fake_firmware/all_data.json b/fixtures/adam_onoff_cooling_fake_firmware/all_data.json index fc2ff2703..edba7d14d 100644 --- a/fixtures/adam_onoff_cooling_fake_firmware/all_data.json +++ b/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, @@ -42,7 +42,11 @@ }, "dev_class": "gateway", "firmware": "3.2.8", - "gateway_modes": ["away", "full", "vacation"], + "gateway_modes": [ + "away", + "full", + "vacation" + ], "hardware": "AME Smile 2.0 board", "location": "eedadcb297564f1483faa509179aebed", "mac_address": "012345670001", @@ -77,7 +81,13 @@ "mode": "auto", "model": "ThermoTouch", "name": "Thermostaat WK", - "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], + "preset_modes": [ + "no_frost", + "vacation", + "away", + "home", + "asleep" + ], "select_schedule": "Werkdag schema", "sensors": { "setpoint": 21.5, diff --git a/fixtures/adam_plus_anna/all_data.json b/fixtures/adam_plus_anna/all_data.json index b43d3c6e7..6ac8023a3 100644 --- a/fixtures/adam_plus_anna/all_data.json +++ b/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 @@ -65,13 +65,22 @@ }, "ee62cad889f94e8ca3d09021f03a660b": { "active_preset": "home", - "available_schedules": ["Weekschema", "off"], + "available_schedules": [ + "Weekschema", + "off" + ], "dev_class": "thermostat", "location": "009490cc2f674ce6b576863fbb64f867", "mode": "auto", "model": "ThermoTouch", "name": "Anna", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": [ + "home", + "asleep", + "away", + "vacation", + "no_frost" + ], "select_schedule": "Weekschema", "sensors": { "setpoint": 20.5, @@ -92,7 +101,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 diff --git a/fixtures/adam_plus_anna/device_list.json b/fixtures/adam_plus_anna/device_list.json index b9291e763..0690d327b 100644 --- a/fixtures/adam_plus_anna/device_list.json +++ b/fixtures/adam_plus_anna/device_list.json @@ -1,7 +1,7 @@ [ "b128b4bbbd1f47e9bf4d756e8fb5ee94", "2743216f626f43948deec1f7ab3b3d70", - "aa6b0002df0a46e1b1eb94beb61eddfe", "ee62cad889f94e8ca3d09021f03a660b", + "aa6b0002df0a46e1b1eb94beb61eddfe", "f2be121e4a9345ac83c6e99ed89a98be" ] diff --git a/fixtures/adam_plus_anna_new/all_data.json b/fixtures/adam_plus_anna_new/all_data.json index 38d62d920..fad810ce1 100644 --- a/fixtures/adam_plus_anna_new/all_data.json +++ b/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 @@ -63,7 +63,7 @@ "electricity_produced_interval": 0.0 }, "switches": { - "lock": true, + "lock": false, "relay": true }, "vendor": "Plugwise", @@ -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 @@ -89,22 +89,6 @@ "vendor": "Plugwise", "zigbee_mac_address": "000D6F000D13CA9A" }, - "67d73d0bd469422db25a618a5fb8eeb0": { - "available": true, - "dev_class": "zz_misc", - "location": "b4f211175e124df59603412bafa77a34", - "model": "lumi.plug.maeu01", - "name": "SmartPlug Floor 0", - "sensors": { - "electricity_consumed_interval": 0.0 - }, - "switches": { - "lock": false, - "relay": true - }, - "vendor": "LUMI", - "zigbee_mac_address": "54EF4410002C97F2" - }, "854f8a9b0e7e425db97f1f110e1ce4b3": { "available": true, "dev_class": "central_heating_pump", @@ -139,17 +123,23 @@ "mode": "auto", "model": "ThermoTouch", "name": "Anna", - "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"], + "preset_modes": [ + "no_frost", + "asleep", + "vacation", + "home", + "away" + ], "select_schedule": "Weekschema", "sensors": { "setpoint": 18.5, "temperature": 18.4 }, "thermostat": { - "lower_bound": 1.0, + "lower_bound": 0.0, "resolution": 0.01, "setpoint": 18.5, - "upper_bound": 35.0 + "upper_bound": 30.0 }, "vendor": "Plugwise" }, @@ -159,13 +149,22 @@ }, "dev_class": "gateway", "firmware": "3.7.8", - "gateway_modes": ["away", "full", "vacation"], + "gateway_modes": [ + "away", + "full", + "vacation" + ], "hardware": "AME Smile 2.0 board", "location": "bc93488efab249e5bc54fd7e175a6f91", "mac_address": "012345679891", "model": "Gateway", "name": "Adam", - "regulation_modes": ["bleeding_hot", "bleeding_cold", "off", "heating"], + "regulation_modes": [ + "bleeding_hot", + "bleeding_cold", + "off", + "heating" + ], "select_gateway_mode": "full", "select_regulation_mode": "heating", "sensors": { @@ -192,7 +191,13 @@ "mode": "auto", "model": "Lisa", "name": "Lisa Badkamer", - "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"], + "preset_modes": [ + "no_frost", + "asleep", + "vacation", + "home", + "away" + ], "select_schedule": "Badkamer", "sensors": { "battery": 38, @@ -231,7 +236,7 @@ "cooling_present": false, "gateway_id": "da224107914542988a88561b4452b0f6", "heater_id": "056ee145a816487eaa69243c3280f8bf", - "item_count": 147, + "item_count": 137, "notifications": {}, "smile_name": "Adam" } diff --git a/fixtures/adam_plus_anna_new/device_list.json b/fixtures/adam_plus_anna_new/device_list.json index b4f3cf98f..2889548fa 100644 --- a/fixtures/adam_plus_anna_new/device_list.json +++ b/fixtures/adam_plus_anna_new/device_list.json @@ -1,12 +1,11 @@ [ "da224107914542988a88561b4452b0f6", "056ee145a816487eaa69243c3280f8bf", - "67d73d0bd469422db25a618a5fb8eeb0", "e2f4322d57924fa090fbbc48b3a140dc", - "854f8a9b0e7e425db97f1f110e1ce4b3", - "ad4838d7d35c4d6ea796ee12ae5aedf8", "29542b2b6a6a4169acecc15c72a599b8", + "ad4838d7d35c4d6ea796ee12ae5aedf8", "1772a4ea304041adb83f357b751341ff", + "854f8a9b0e7e425db97f1f110e1ce4b3", "2568cc4b9c1e401495d4741a5f89bee1", "e8ef2a01ed3b4139a53bf749204fe6b4" ] diff --git a/fixtures/adam_zone_per_device/all_data.json b/fixtures/adam_zone_per_device/all_data.json index 43e85d00e..39f46d4cb 100644 --- a/fixtures/adam_zone_per_device/all_data.json +++ b/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 @@ -122,7 +122,13 @@ "mode": "auto", "model": "Lisa", "name": "Zone Thermostat Jessie", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": [ + "home", + "asleep", + "away", + "vacation", + "no_frost" + ], "select_schedule": "CV Jessie", "sensors": { "battery": 37, @@ -165,7 +171,7 @@ }, "90986d591dcd426cae3ec3e8111ff730": { "binary_sensors": { - "heating_state": false + "heating_state": true }, "dev_class": "heater_central", "location": "1f9dcf83fd4e4b66b72ff787957bfe5d", @@ -233,7 +239,7 @@ "setpoint": 21.5, "temperature": 26.2, "temperature_difference": 3.7, - "valve_position": 0.0 + "valve_position": 100 }, "temperature_offset": { "lower_bound": -2.0, @@ -262,7 +268,13 @@ "mode": "auto", "model": "Lisa", "name": "Zone Lisa WK", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": [ + "home", + "asleep", + "away", + "vacation", + "no_frost" + ], "select_schedule": "GF7 Woonkamer", "sensors": { "battery": 34, @@ -346,7 +358,13 @@ "mode": "heat", "model": "Lisa", "name": "Zone Lisa Bios", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": [ + "home", + "asleep", + "away", + "vacation", + "no_frost" + ], "select_schedule": "off", "sensors": { "battery": 67, @@ -386,7 +404,13 @@ "mode": "heat", "model": "Tom/Floor", "name": "CV Kraan Garage", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": [ + "home", + "asleep", + "away", + "vacation", + "no_frost" + ], "select_schedule": "off", "sensors": { "battery": 68, @@ -428,7 +452,13 @@ "mode": "auto", "model": "Lisa", "name": "Zone Thermostat Badkamer", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": [ + "home", + "asleep", + "away", + "vacation", + "no_frost" + ], "select_schedule": "Badkamer Schema", "sensors": { "battery": 92, diff --git a/fixtures/adam_zone_per_device/device_list.json b/fixtures/adam_zone_per_device/device_list.json index 104a723e4..606a1ce20 100644 --- a/fixtures/adam_zone_per_device/device_list.json +++ b/fixtures/adam_zone_per_device/device_list.json @@ -1,20 +1,20 @@ [ "fe799307f1624099878210aa0b9f1475", "90986d591dcd426cae3ec3e8111ff730", - "df4a4a8169904cdb9c03d61a21f42140", - "b310b72a0e354bfab43089919b9a88bf", - "a2c3583e0a6349358998b760cea82d2a", "b59bcebaf94b499ea7d46e4a66fb62d8", "d3da73bde12a47d5a6b8f9dad971f2ec", - "21f2b542c49845e6bb416884c55778d6", - "78d1126fc4c743db81b61c20e88342a7", "cd0ddb54ef694e11ac18ed1cbce5dbbd", - "4a810418d5394b3f82727340b91ba740", - "02cf28bfec924855854c544690a609ef", - "a28f588dc4a049a483fd03a30361ad3a", "6a3bf693d05e48e0b460c815a4fdd09d", - "680423ff840043738f42cc7f1ff97a36", + "21f2b542c49845e6bb416884c55778d6", + "b310b72a0e354bfab43089919b9a88bf", + "a2c3583e0a6349358998b760cea82d2a", + "02cf28bfec924855854c544690a609ef", "f1fee6043d3642a9b0a65297455f008e", + "680423ff840043738f42cc7f1ff97a36", + "e7693eb9582644e5b865dba8d4447cf1", + "df4a4a8169904cdb9c03d61a21f42140", "675416a629f343c495449970e2ca37b5", - "e7693eb9582644e5b865dba8d4447cf1" + "4a810418d5394b3f82727340b91ba740", + "a28f588dc4a049a483fd03a30361ad3a", + "78d1126fc4c743db81b61c20e88342a7" ] diff --git a/tests/data/adam/adam_plus_anna_new.json b/tests/data/adam/adam_plus_anna_new.json index 4e7d35912..69f1ecd81 100644 --- a/tests/data/adam/adam_plus_anna_new.json +++ b/tests/data/adam/adam_plus_anna_new.json @@ -32,7 +32,7 @@ }, "sensors": { "water_temperature": 30, - "intended_boiler_temperature": 20 + "intended_boiler_temperature": 23.9 }, "switches": { "dhw_cm_switch": false From 75127d1f7d51b94d804fa644cff2a8d2bf6adf26 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Tue, 2 Jan 2024 13:26:46 +0100 Subject: [PATCH 032/306] Add module as well to domain_objects --- .../core.domain_objects.xml | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/userdata/adam_plus_anna_new/core.domain_objects.xml b/userdata/adam_plus_anna_new/core.domain_objects.xml index fb0e593a0..4bfdeec78 100644 --- a/userdata/adam_plus_anna_new/core.domain_objects.xml +++ b/userdata/adam_plus_anna_new/core.domain_objects.xml @@ -51,6 +51,52 @@ + + LUMI + lumi.plug.maeu01 + + + + 2022-03-11T11:21:37.406+01:00 + 2022-03-11T18:44:23.929+01:00 + + + + + + + + + + + + 54EF4410002C97F2 + router + true + mains + + + + 63 + 1 + sibling + + + 75 + 1 + sibling + + + 67 + 0 + parent + + + 2023-12-22T16:24:36+01:00 + true + + + Lisa Badkamer A zone thermostat regulates the temperature in a heating zone (generally a room). From 01f0ef6b7ed9c60bb8f8f16a318f42b7d79b8883 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Tue, 2 Jan 2024 13:40:07 +0100 Subject: [PATCH 033/306] Fix lower/upper_bound for Anna --- userdata/adam_plus_anna_new/core.domain_objects.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/userdata/adam_plus_anna_new/core.domain_objects.xml b/userdata/adam_plus_anna_new/core.domain_objects.xml index 4bfdeec78..ffda710a7 100644 --- a/userdata/adam_plus_anna_new/core.domain_objects.xml +++ b/userdata/adam_plus_anna_new/core.domain_objects.xml @@ -584,8 +584,8 @@ 2023-12-22T16:30:38.873+01:00 thermostat - 0 - 30 + 1 + 35 0.01 18.5 From f4d33a2136add35afb43d2a20cbf37d9b44a00e3 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Tue, 2 Jan 2024 13:41:10 +0100 Subject: [PATCH 034/306] Fix 11 --- tests/data/adam/adam_plus_anna_new.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/adam/adam_plus_anna_new.json b/tests/data/adam/adam_plus_anna_new.json index 69f1ecd81..911e787b4 100644 --- a/tests/data/adam/adam_plus_anna_new.json +++ b/tests/data/adam/adam_plus_anna_new.json @@ -158,7 +158,7 @@ "zigbee_mac_address": "000D6F000D13CA9A", "vendor": "Plugwise", "sensors": { - "electricity_consumed": 87.6, + "electricity_consumed": 91.3, "electricity_consumed_interval": 23, "electricity_produced": 0, "electricity_produced_interval": 0 From d6c61637311837a210d92f006a62f53674a2ed03 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Tue, 2 Jan 2024 13:42:52 +0100 Subject: [PATCH 035/306] Correct usersdata --- userdata/adam_plus_anna_new/core.domain_objects.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userdata/adam_plus_anna_new/core.domain_objects.xml b/userdata/adam_plus_anna_new/core.domain_objects.xml index ffda710a7..67a2e1626 100644 --- a/userdata/adam_plus_anna_new/core.domain_objects.xml +++ b/userdata/adam_plus_anna_new/core.domain_objects.xml @@ -1954,7 +1954,7 @@ 2023-12-22T16:29:30.555+01:00 - false + true on From 4b5531c52b84e37637fd9167b9d0779b7b76e047 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Tue, 2 Jan 2024 13:50:47 +0100 Subject: [PATCH 036/306] Fix device order --- tests/test_adam.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_adam.py b/tests/test_adam.py index 81c0c8add..1745fe0c0 100644 --- a/tests/test_adam.py +++ b/tests/test_adam.py @@ -247,10 +247,10 @@ async def test_connect_adam_plus_anna_new(self): "056ee145a816487eaa69243c3280f8bf", "67d73d0bd469422db25a618a5fb8eeb0", "e2f4322d57924fa090fbbc48b3a140dc", - "854f8a9b0e7e425db97f1f110e1ce4b3", - "ad4838d7d35c4d6ea796ee12ae5aedf8", "29542b2b6a6a4169acecc15c72a599b8", + "ad4838d7d35c4d6ea796ee12ae5aedf8", "1772a4ea304041adb83f357b751341ff", + "854f8a9b0e7e425db97f1f110e1ce4b3", "2568cc4b9c1e401495d4741a5f89bee1", "e8ef2a01ed3b4139a53bf749204fe6b4", ] From 5041bf4478005887c07bbc74641d563c8bf0aa03 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Tue, 2 Jan 2024 13:56:13 +0100 Subject: [PATCH 037/306] Move aqara data to updated/domain_objects too --- .../core.domain_objects.xml | 97 +++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/userdata/updated/adam_plus_anna_new/core.domain_objects.xml b/userdata/updated/adam_plus_anna_new/core.domain_objects.xml index 03ea1e583..2e1f1078f 100644 --- a/userdata/updated/adam_plus_anna_new/core.domain_objects.xml +++ b/userdata/updated/adam_plus_anna_new/core.domain_objects.xml @@ -1,5 +1,102 @@ + + SmartPlug Floor 0 + A device that communicates through the ZigBee protocol. + 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 + + + + + + electricity_consumed + Wh + 2023-12-22T16:15:00+01:00 + 2023-12-22T16:00:00+01:00 + PT15M + + + 0.00 + + + + electricity_produced + Wh + + + PT15M + + + + relay + + 2023-12-22T16:18:09.841+01:00 + 2022-06-11T15:25:12.796+02:00 + + + + on + + + + + + 2023-12-22T16:18:09.841+01:00 + true + on + + + + + + LUMI + lumi.plug.maeu01 + + + + 2022-03-11T11:21:37.406+01:00 + 2022-03-11T18:44:23.929+01:00 + + + + + + + + + + + + 54EF4410002C97F2 + router + true + mains + + + + 63 + 1 + sibling + + + 75 + 1 + sibling + + + 67 + 0 + parent + + + 2023-12-22T16:24:36+01:00 + true + + + Lisa Badkamer A zone thermostat regulates the temperature in a heating zone (generally a room). From 526c7c34371235ae1e7a861e9233e8c1a5b1d691 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Tue, 2 Jan 2024 13:58:55 +0100 Subject: [PATCH 038/306] Fix regulation_mode --- userdata/updated/adam_plus_anna_new/core.domain_objects.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/userdata/updated/adam_plus_anna_new/core.domain_objects.xml b/userdata/updated/adam_plus_anna_new/core.domain_objects.xml index 2e1f1078f..c54aac055 100644 --- a/userdata/updated/adam_plus_anna_new/core.domain_objects.xml +++ b/userdata/updated/adam_plus_anna_new/core.domain_objects.xml @@ -2130,7 +2130,7 @@ - heating + off @@ -2172,7 +2172,7 @@ 2023-12-10T11:40:02.539+01:00 regulation_mode - heating + off bleeding_hot bleeding_cold From 8b29d7f75d7224e09b3f421f9fbf252bf4326899 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Tue, 2 Jan 2024 14:00:28 +0100 Subject: [PATCH 039/306] Fix relay state --- userdata/updated/adam_plus_anna_new/core.domain_objects.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/userdata/updated/adam_plus_anna_new/core.domain_objects.xml b/userdata/updated/adam_plus_anna_new/core.domain_objects.xml index c54aac055..ffe7c5204 100644 --- a/userdata/updated/adam_plus_anna_new/core.domain_objects.xml +++ b/userdata/updated/adam_plus_anna_new/core.domain_objects.xml @@ -270,7 +270,7 @@ - on + off @@ -300,7 +300,7 @@ 2023-12-22T16:24:29.783+01:00 false - on + off From f2e51a630cdbc82c770506b98698aecbec34d95e Mon Sep 17 00:00:00 2001 From: Bouwe Date: Tue, 2 Jan 2024 14:04:57 +0100 Subject: [PATCH 040/306] Fix 12 --- .../updated/adam_plus_anna_new/core.domain_objects.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/userdata/updated/adam_plus_anna_new/core.domain_objects.xml b/userdata/updated/adam_plus_anna_new/core.domain_objects.xml index ffe7c5204..4f95655f1 100644 --- a/userdata/updated/adam_plus_anna_new/core.domain_objects.xml +++ b/userdata/updated/adam_plus_anna_new/core.domain_objects.xml @@ -1915,7 +1915,7 @@ - 14.81 + 0.00 @@ -1937,7 +1937,7 @@ PT15M - 3.00 + 0.00 @@ -1948,7 +1948,7 @@ - on + off @@ -1967,7 +1967,7 @@ 2023-12-22T16:29:30.555+01:00 false - on + off From cb29d003e8f9f0fd01f709a6477c91967ac4dec9 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Tue, 2 Jan 2024 14:07:01 +0100 Subject: [PATCH 041/306] Fix reachable to false --- userdata/updated/adam_plus_anna_new/core.domain_objects.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userdata/updated/adam_plus_anna_new/core.domain_objects.xml b/userdata/updated/adam_plus_anna_new/core.domain_objects.xml index 4f95655f1..8b9d83c03 100644 --- a/userdata/updated/adam_plus_anna_new/core.domain_objects.xml +++ b/userdata/updated/adam_plus_anna_new/core.domain_objects.xml @@ -1197,7 +1197,7 @@ 000D6F000C8FF5EE end_device - true + false battery false false From 3b0fe118ebfde179113dc77bb6ad39aab344bd8e Mon Sep 17 00:00:00 2001 From: Bouwe Date: Thu, 4 Jan 2024 19:13:22 +0100 Subject: [PATCH 042/306] Fix 13 --- tests/data/adam/adam_jip.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/adam/adam_jip.json b/tests/data/adam/adam_jip.json index 5ebb3d5b5..fdaaf8e14 100644 --- a/tests/data/adam/adam_jip.json +++ b/tests/data/adam/adam_jip.json @@ -192,7 +192,7 @@ "vendor": "Plugwise", "available": true, "sensors": { - "temperature": 24.3, + "temperature": 24.2, "setpoint": 13, "temperature_difference": 1.7, "valve_position": 0 From ada0ec1c97163950669f73b95916f8bd7d64f013 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Thu, 4 Jan 2024 19:15:02 +0100 Subject: [PATCH 043/306] Fix 14 --- tests/data/anna/anna_v4.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/anna/anna_v4.json b/tests/data/anna/anna_v4.json index fced6b820..dbd75c4c9 100644 --- a/tests/data/anna/anna_v4.json +++ b/tests/data/anna/anna_v4.json @@ -21,7 +21,7 @@ "binary_sensors": { "dhw_state": false, "heating_state": true, - "flame_state": true + "flame_state": false }, "sensors": { "water_temperature": 52, From 0a839da65d5a9009ce49f1ed269b1eb3db7a49a9 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Thu, 4 Jan 2024 19:16:00 +0100 Subject: [PATCH 044/306] Fix 15 --- tests/data/anna/anna_v4.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/anna/anna_v4.json b/tests/data/anna/anna_v4.json index dbd75c4c9..f92f33882 100644 --- a/tests/data/anna/anna_v4.json +++ b/tests/data/anna/anna_v4.json @@ -24,7 +24,7 @@ "flame_state": false }, "sensors": { - "water_temperature": 52, + "water_temperature": 45, "intended_boiler_temperature": 48.6, "modulation_level": 0, "return_temperature": 42, From d852944ff2936e98dc871d6c01838f80f75d5acf Mon Sep 17 00:00:00 2001 From: Bouwe Date: Thu, 4 Jan 2024 19:20:36 +0100 Subject: [PATCH 045/306] Fix 16 --- tests/data/anna/anna_v4.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/anna/anna_v4.json b/tests/data/anna/anna_v4.json index f92f33882..3c5c7a594 100644 --- a/tests/data/anna/anna_v4.json +++ b/tests/data/anna/anna_v4.json @@ -25,7 +25,7 @@ }, "sensors": { "water_temperature": 45, - "intended_boiler_temperature": 48.6, + "intended_boiler_temperature": 39.9, "modulation_level": 0, "return_temperature": 42, "water_pressure": 2.1 From 445dd158f4c189f36575ca58ababaf40942da098 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Thu, 4 Jan 2024 19:22:26 +0100 Subject: [PATCH 046/306] Fix 17 --- tests/data/anna/anna_v4.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/anna/anna_v4.json b/tests/data/anna/anna_v4.json index 3c5c7a594..80d3a2308 100644 --- a/tests/data/anna/anna_v4.json +++ b/tests/data/anna/anna_v4.json @@ -27,7 +27,7 @@ "water_temperature": 45, "intended_boiler_temperature": 39.9, "modulation_level": 0, - "return_temperature": 42, + "return_temperature": 32, "water_pressure": 2.1 }, "switches": { From 4ad1aa9fc3c7d00e9794a10c5111afaa2bd73b0f Mon Sep 17 00:00:00 2001 From: Bouwe Date: Thu, 4 Jan 2024 19:23:32 +0100 Subject: [PATCH 047/306] Fix 18 --- tests/data/anna/anna_v4.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/anna/anna_v4.json b/tests/data/anna/anna_v4.json index 80d3a2308..544dea42d 100644 --- a/tests/data/anna/anna_v4.json +++ b/tests/data/anna/anna_v4.json @@ -28,7 +28,7 @@ "intended_boiler_temperature": 39.9, "modulation_level": 0, "return_temperature": 32, - "water_pressure": 2.1 + "water_pressure": 2.2 }, "switches": { "dhw_cm_switch": false From 90eb8c07af10092b23e7c158a8eedd65b417343d Mon Sep 17 00:00:00 2001 From: Bouwe Date: Thu, 4 Jan 2024 19:24:58 +0100 Subject: [PATCH 048/306] Fix 19 --- tests/data/anna/anna_v4.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/data/anna/anna_v4.json b/tests/data/anna/anna_v4.json index 544dea42d..23ff33fb7 100644 --- a/tests/data/anna/anna_v4.json +++ b/tests/data/anna/anna_v4.json @@ -54,9 +54,9 @@ "select_schedule": "off", "mode": "heat", "sensors": { - "temperature": 20.5, + "temperature": 20.6, "setpoint": 20.5, - "illuminance": 40.5 + "illuminance": 60.0 } }, "0466eae8520144c78afb29628384edeb": { From 52dcff36928266830512bca80a90006739da6f0d Mon Sep 17 00:00:00 2001 From: Bouwe Date: Thu, 4 Jan 2024 19:58:32 +0100 Subject: [PATCH 049/306] Update updated userdata 1 --- fixtures/adam_jip/all_data.json | 63 +++++++++++++++---- fixtures/adam_jip/device_list.json | 12 ++-- fixtures/adam_plus_anna_new/all_data.json | 24 +++++-- fixtures/adam_plus_anna_new/device_list.json | 1 + fixtures/anna_v4/all_data.json | 28 ++++++--- .../updated/anna_v4/core.domain_objects.xml | 32 +++++----- 6 files changed, 114 insertions(+), 46 deletions(-) diff --git a/fixtures/adam_jip/all_data.json b/fixtures/adam_jip/all_data.json index a5f5124cd..549ead193 100644 --- a/fixtures/adam_jip/all_data.json +++ b/fixtures/adam_jip/all_data.json @@ -3,7 +3,9 @@ "1346fbd8498d4dbcab7e18d51b771f3d": { "active_preset": "no_frost", "available": true, - "available_schedules": ["None"], + "available_schedules": [ + "None" + ], "control_state": "off", "dev_class": "zone_thermostat", "firmware": "2016-10-27T02:00:00+02:00", @@ -12,7 +14,13 @@ "mode": "heat", "model": "Lisa", "name": "Slaapkamer", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": [ + "home", + "asleep", + "away", + "vacation", + "no_frost" + ], "select_schedule": "None", "sensors": { "battery": 92, @@ -67,7 +75,7 @@ "name": "Tom Slaapkamer", "sensors": { "setpoint": 13.0, - "temperature": 24.3, + "temperature": 24.2, "temperature_difference": 1.7, "valve_position": 0.0 }, @@ -99,7 +107,9 @@ "6f3e9d7084214c21b9dfa46f6eeb8700": { "active_preset": "home", "available": true, - "available_schedules": ["None"], + "available_schedules": [ + "None" + ], "control_state": "off", "dev_class": "zone_thermostat", "firmware": "2016-10-27T02:00:00+02:00", @@ -108,7 +118,13 @@ "mode": "heat", "model": "Lisa", "name": "Kinderkamer", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": [ + "home", + "asleep", + "away", + "vacation", + "no_frost" + ], "select_schedule": "None", "sensors": { "battery": 79, @@ -156,7 +172,9 @@ "a6abc6a129ee499c88a4d420cc413b47": { "active_preset": "home", "available": true, - "available_schedules": ["None"], + "available_schedules": [ + "None" + ], "control_state": "off", "dev_class": "zone_thermostat", "firmware": "2016-10-27T02:00:00+02:00", @@ -165,7 +183,13 @@ "mode": "heat", "model": "Lisa", "name": "Logeerkamer", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": [ + "home", + "asleep", + "away", + "vacation", + "no_frost" + ], "select_schedule": "None", "sensors": { "battery": 80, @@ -193,13 +217,22 @@ }, "dev_class": "gateway", "firmware": "3.2.8", - "gateway_modes": ["away", "full", "vacation"], + "gateway_modes": [ + "away", + "full", + "vacation" + ], "hardware": "AME Smile 2.0 board", "location": "9e4433a9d69f40b3aefd15e74395eaec", "mac_address": "012345670001", "model": "Gateway", "name": "Adam", - "regulation_modes": ["heating", "off", "bleeding_cold", "bleeding_hot"], + "regulation_modes": [ + "heating", + "off", + "bleeding_cold", + "bleeding_hot" + ], "select_gateway_mode": "full", "select_regulation_mode": "heating", "sensors": { @@ -269,7 +302,9 @@ "f61f1a2535f54f52ad006a3d18e459ca": { "active_preset": "home", "available": true, - "available_schedules": ["None"], + "available_schedules": [ + "None" + ], "control_state": "off", "dev_class": "zone_thermometer", "firmware": "2020-09-01T02:00:00+02:00", @@ -278,7 +313,13 @@ "mode": "heat", "model": "Jip", "name": "Woonkamer", - "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], + "preset_modes": [ + "home", + "asleep", + "away", + "vacation", + "no_frost" + ], "select_schedule": "None", "sensors": { "battery": 100, diff --git a/fixtures/adam_jip/device_list.json b/fixtures/adam_jip/device_list.json index 049845bc8..356cbad14 100644 --- a/fixtures/adam_jip/device_list.json +++ b/fixtures/adam_jip/device_list.json @@ -1,13 +1,13 @@ [ "b5c2386c6f6342669e50fe49dd05b188", "e4684553153b44afbef2200885f379dc", - "a6abc6a129ee499c88a4d420cc413b47", - "1346fbd8498d4dbcab7e18d51b771f3d", - "833de10f269c4deab58fb9df69901b4e", "6f3e9d7084214c21b9dfa46f6eeb8700", - "f61f1a2535f54f52ad006a3d18e459ca", "d4496250d0e942cfa7aea3476e9070d5", + "a6abc6a129ee499c88a4d420cc413b47", + "833de10f269c4deab58fb9df69901b4e", "356b65335e274d769c338223e7af9c33", - "1da4d325838e4ad8aac12177214505c9", - "457ce8414de24596a2d5e7dbc9c7682f" + "1346fbd8498d4dbcab7e18d51b771f3d", + "457ce8414de24596a2d5e7dbc9c7682f", + "f61f1a2535f54f52ad006a3d18e459ca", + "1da4d325838e4ad8aac12177214505c9" ] diff --git a/fixtures/adam_plus_anna_new/all_data.json b/fixtures/adam_plus_anna_new/all_data.json index fad810ce1..8fa09e2fe 100644 --- a/fixtures/adam_plus_anna_new/all_data.json +++ b/fixtures/adam_plus_anna_new/all_data.json @@ -63,7 +63,7 @@ "electricity_produced_interval": 0.0 }, "switches": { - "lock": false, + "lock": true, "relay": true }, "vendor": "Plugwise", @@ -89,6 +89,22 @@ "vendor": "Plugwise", "zigbee_mac_address": "000D6F000D13CA9A" }, + "67d73d0bd469422db25a618a5fb8eeb0": { + "available": true, + "dev_class": "zz_misc", + "location": "b4f211175e124df59603412bafa77a34", + "model": "lumi.plug.maeu01", + "name": "SmartPlug Floor 0", + "sensors": { + "electricity_consumed_interval": 0.0 + }, + "switches": { + "lock": false, + "relay": true + }, + "vendor": "LUMI", + "zigbee_mac_address": "54EF4410002C97F2" + }, "854f8a9b0e7e425db97f1f110e1ce4b3": { "available": true, "dev_class": "central_heating_pump", @@ -136,10 +152,10 @@ "temperature": 18.4 }, "thermostat": { - "lower_bound": 0.0, + "lower_bound": 1.0, "resolution": 0.01, "setpoint": 18.5, - "upper_bound": 30.0 + "upper_bound": 35.0 }, "vendor": "Plugwise" }, @@ -236,7 +252,7 @@ "cooling_present": false, "gateway_id": "da224107914542988a88561b4452b0f6", "heater_id": "056ee145a816487eaa69243c3280f8bf", - "item_count": 137, + "item_count": 147, "notifications": {}, "smile_name": "Adam" } diff --git a/fixtures/adam_plus_anna_new/device_list.json b/fixtures/adam_plus_anna_new/device_list.json index 2889548fa..810dc8453 100644 --- a/fixtures/adam_plus_anna_new/device_list.json +++ b/fixtures/adam_plus_anna_new/device_list.json @@ -1,6 +1,7 @@ [ "da224107914542988a88561b4452b0f6", "056ee145a816487eaa69243c3280f8bf", + "67d73d0bd469422db25a618a5fb8eeb0", "e2f4322d57924fa090fbbc48b3a140dc", "29542b2b6a6a4169acecc15c72a599b8", "ad4838d7d35c4d6ea796ee12ae5aedf8", diff --git a/fixtures/anna_v4/all_data.json b/fixtures/anna_v4/all_data.json index 0fc8a5a33..160edc44d 100644 --- a/fixtures/anna_v4/all_data.json +++ b/fixtures/anna_v4/all_data.json @@ -2,7 +2,11 @@ "devices": { "01b85360fdd243d0aaad4d6ac2a5ba7e": { "active_preset": "home", - "available_schedules": ["Standaard", "Thuiswerken", "off"], + "available_schedules": [ + "Standaard", + "Thuiswerken", + "off" + ], "dev_class": "thermostat", "firmware": "2018-02-08T11:15:53+01:00", "hardware": "6539-1301-5002", @@ -10,12 +14,18 @@ "mode": "heat", "model": "ThermoTouch", "name": "Anna", - "preset_modes": ["vacation", "no_frost", "away", "asleep", "home"], + "preset_modes": [ + "vacation", + "no_frost", + "away", + "asleep", + "home" + ], "select_schedule": "off", "sensors": { - "illuminance": 40.5, + "illuminance": 60.0, "setpoint": 20.5, - "temperature": 20.5 + "temperature": 20.6 }, "temperature_offset": { "lower_bound": -2.0, @@ -51,7 +61,7 @@ "available": true, "binary_sensors": { "dhw_state": false, - "flame_state": true, + "flame_state": false, "heating_state": true }, "dev_class": "heater_central", @@ -71,11 +81,11 @@ "model": "2.32", "name": "OpenTherm", "sensors": { - "intended_boiler_temperature": 48.6, + "intended_boiler_temperature": 39.9, "modulation_level": 0.0, - "return_temperature": 42.0, - "water_pressure": 2.1, - "water_temperature": 52.0 + "return_temperature": 32.0, + "water_pressure": 2.2, + "water_temperature": 45.0 }, "switches": { "dhw_cm_switch": false diff --git a/userdata/updated/anna_v4/core.domain_objects.xml b/userdata/updated/anna_v4/core.domain_objects.xml index f00c6ec76..ad45fd1c6 100644 --- a/userdata/updated/anna_v4/core.domain_objects.xml +++ b/userdata/updated/anna_v4/core.domain_objects.xml @@ -176,7 +176,7 @@ C 2020-04-02T10:39:56.810+02:00 - 20.64 + 19.54 @@ -236,7 +236,7 @@ lx 2020-04-02T10:39:23.858+02:00 - 60.00 + 39.52 @@ -286,7 +286,7 @@ 2020-04-02T08:33:57.421+02:00 - on + off @@ -296,7 +296,7 @@ C 2020-04-02T08:33:05.127+02:00 - 20.50 + 19.50 @@ -351,7 +351,7 @@ 2020-04-02T08:33:05.128+02:00 thermostat - 20.5 + 19.5 4 30 0.1 @@ -717,7 +717,7 @@ C 2020-04-02T10:41:11.955+02:00 - 45.00 + 51.00 @@ -727,7 +727,7 @@ C 2020-04-02T10:41:15.465+02:00 - 39.93 + 0.00 @@ -737,7 +737,7 @@ 2019-05-17T09:11:06.126+02:00 - off + on @@ -765,7 +765,7 @@ C 2019-05-14T20:03:51.811+02:00 - 60.00 + 59.00 @@ -785,7 +785,7 @@ C 2020-04-02T10:41:18.378+02:00 - 32.00 + 41.00 @@ -805,7 +805,7 @@ C 2020-04-01T05:20:03.542+02:00 - 70.00 + 69.00 @@ -836,7 +836,7 @@ 2020-04-02T08:33:57.435+02:00 - on + off @@ -906,7 +906,7 @@ bar 2020-04-02T09:58:51.221+02:00 - 2.20 + 2.10 @@ -915,7 +915,7 @@ 2020-04-01T09:58:10.148+02:00 domestic_hot_water_setpoint - 60 + 59 30 60 0.01 @@ -926,12 +926,12 @@ 2020-04-01T09:58:10.130+02:00 domestic_hot_water_comfort_mode - off + on 2020-04-01T09:58:09.977+02:00 maximum_boiler_temperature - 70 + 69 0 100 1 From d1dd3cfd50aad8b5595eb2a603ce38bb392e437e Mon Sep 17 00:00:00 2001 From: Bouwe Date: Fri, 5 Jan 2024 08:29:38 +0100 Subject: [PATCH 050/306] Update usersdata 2 --- userdata/anna_v4_dhw/core.domain_objects.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/userdata/anna_v4_dhw/core.domain_objects.xml b/userdata/anna_v4_dhw/core.domain_objects.xml index 59af9cf32..247aaf654 100644 --- a/userdata/anna_v4_dhw/core.domain_objects.xml +++ b/userdata/anna_v4_dhw/core.domain_objects.xml @@ -282,7 +282,7 @@ 2020-04-02T08:33:57.421+02:00 - on + off @@ -693,7 +693,7 @@ 2020-04-02T10:40:48.832+02:00 - off + on @@ -791,7 +791,7 @@ 2020-04-02T08:55:49.305+02:00 - off + on @@ -832,7 +832,7 @@ 2020-04-02T08:33:57.435+02:00 - on + off From 148da6a5026e7d90197ef151fbc47cbd06da0b4c Mon Sep 17 00:00:00 2001 From: Bouwe Date: Fri, 5 Jan 2024 08:31:05 +0100 Subject: [PATCH 051/306] Fix 20 --- tests/data/anna/anna_v4_dhw.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/data/anna/anna_v4_dhw.json b/tests/data/anna/anna_v4_dhw.json index a70be4414..d53f194ef 100644 --- a/tests/data/anna/anna_v4_dhw.json +++ b/tests/data/anna/anna_v4_dhw.json @@ -24,11 +24,11 @@ "flame_state": true }, "sensors": { - "water_temperature": 52, - "intended_boiler_temperature": 48.6, + "water_temperature": 45, + "intended_boiler_temperature": 39.9, "modulation_level": 0, - "return_temperature": 42, - "water_pressure": 2.1 + "return_temperature": 32, + "water_pressure": 2.2 }, "switches": { "dhw_cm_switch": false From 3b43e955264b209d055a90f2674e738ffe7186e2 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Fri, 5 Jan 2024 08:32:26 +0100 Subject: [PATCH 052/306] Fix 21 --- tests/data/anna/anna_v4_dhw.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/data/anna/anna_v4_dhw.json b/tests/data/anna/anna_v4_dhw.json index d53f194ef..15ac115c3 100644 --- a/tests/data/anna/anna_v4_dhw.json +++ b/tests/data/anna/anna_v4_dhw.json @@ -54,9 +54,9 @@ "select_schedule": "off", "mode": "heat", "sensors": { - "temperature": 20.5, + "temperature": 20.6, "setpoint": 20.5, - "illuminance": 40.5 + "illuminance": 60.0 } }, "0466eae8520144c78afb29628384edeb": { From 854147880e7fe451aa5f41dfdac4abfc4cfe36e6 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Fri, 5 Jan 2024 18:30:02 +0100 Subject: [PATCH 053/306] Update userdata 3 --- .../core.domain_objects.xml | 35 +++++++++++++++---- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/userdata/anna_heatpump_heating/core.domain_objects.xml b/userdata/anna_heatpump_heating/core.domain_objects.xml index e0a3121db..d455dc482 100644 --- a/userdata/anna_heatpump_heating/core.domain_objects.xml +++ b/userdata/anna_heatpump_heating/core.domain_objects.xml @@ -322,7 +322,7 @@ C 2020-04-09T13:51:55.147+02:00 - 18.00 + 3.00 @@ -382,7 +382,7 @@ C 2020-04-03T07:54:47.729+02:00 - 0.00 + 35.00 @@ -701,7 +701,7 @@ 2020-04-09T12:44:36.599+02:00 - 9 + 3 @@ -751,7 +751,7 @@ 2020-04-03T07:54:23.120+02:00 - off + on @@ -765,6 +765,17 @@ + + cooling_enabled + + 2022-11-02T03:57:23.207+01:00 + 2022-11-02T03:57:23.207+01:00 + + + + off + + @@ -869,6 +880,16 @@ + + 2020-04-08T19:24:38.964+02:00 + domestic_hot_water_setpoint + 53 + 35 + 60 + 0.01 + + + 2020-04-09T13:25:35.254+02:00 @@ -1077,7 +1098,7 @@ C 2020-04-09T14:09:41+02:00 - 20.25 + 20.23 @@ -1343,7 +1364,7 @@ C 2020-04-09T14:12:19.497+02:00 - 23.30 + 19.30 @@ -1493,7 +1514,7 @@ 2020-04-03T07:54:23.097+02:00 - off + on From 4121f4e13da798477a1dd4d60a4f6b69942173aa Mon Sep 17 00:00:00 2001 From: Bouwe Date: Fri, 5 Jan 2024 19:18:51 +0100 Subject: [PATCH 054/306] Update updated userdata 3 --- .../core.domain_objects.xml | 34 +++++++++++++++---- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/userdata/updated/anna_heatpump_heating/core.domain_objects.xml b/userdata/updated/anna_heatpump_heating/core.domain_objects.xml index e0a3121db..c5a496894 100644 --- a/userdata/updated/anna_heatpump_heating/core.domain_objects.xml +++ b/userdata/updated/anna_heatpump_heating/core.domain_objects.xml @@ -322,7 +322,7 @@ C 2020-04-09T13:51:55.147+02:00 - 18.00 + 3.00 @@ -382,7 +382,7 @@ C 2020-04-03T07:54:47.729+02:00 - 0.00 + 35.00 @@ -701,7 +701,7 @@ 2020-04-09T12:44:36.599+02:00 - 9 + 3 @@ -751,7 +751,7 @@ 2020-04-03T07:54:23.120+02:00 - off + on @@ -765,6 +765,17 @@ + + cooling_enabled + + 2022-11-02T03:57:23.207+01:00 + 2022-11-02T03:57:23.207+01:00 + + + + off + + @@ -869,6 +880,15 @@ + + + domestic_hot_water_setpoint + 35 + 60 + 0.01 + + + 2020-04-09T13:25:35.254+02:00 @@ -1077,7 +1097,7 @@ C 2020-04-09T14:09:41+02:00 - 20.25 + 20.23 @@ -1343,7 +1363,7 @@ C 2020-04-09T14:12:19.497+02:00 - 23.30 + 19.30 @@ -1493,7 +1513,7 @@ 2020-04-03T07:54:23.097+02:00 - off + on From 9f0a56debe1fc2542d6c2ec557b7ce2517954e9b Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 6 Jan 2024 19:03:55 +0100 Subject: [PATCH 055/306] Fix 22 --- tests/data/anna/anna_heatpump_cooling.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/anna/anna_heatpump_cooling.json b/tests/data/anna/anna_heatpump_cooling.json index 6141d8029..dc4f32e53 100644 --- a/tests/data/anna/anna_heatpump_cooling.json +++ b/tests/data/anna/anna_heatpump_cooling.json @@ -72,7 +72,7 @@ "mode": "heat_cool", "sensors": { "temperature": 22.3, - "illuminance": 25.5, + "illuminance": 24.5, "cooling_activation_outdoor_temperature": 21, "cooling_deactivation_threshold": 6, "setpoint_low": 4, From d758ba640c4f09debd9f8e936dd24c91c66eb2b4 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 6 Jan 2024 19:20:53 +0100 Subject: [PATCH 056/306] Update userdata 4 --- .../anna_heatpump_cooling/core.domain_objects.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/userdata/anna_heatpump_cooling/core.domain_objects.xml b/userdata/anna_heatpump_cooling/core.domain_objects.xml index 9a2acfd83..108a62b57 100644 --- a/userdata/anna_heatpump_cooling/core.domain_objects.xml +++ b/userdata/anna_heatpump_cooling/core.domain_objects.xml @@ -1547,6 +1547,17 @@ + + cooling_enabled + + 2022-11-02T03:57:23.207+01:00 + 2022-11-02T03:57:23.207+01:00 + + + + on + + From 5476dd1e6e0f1bff7018570af2d0d9267133fc44 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 6 Jan 2024 19:29:22 +0100 Subject: [PATCH 057/306] Update userdata 5 --- .../core.domain_objects.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/userdata/anna_heatpump_cooling_fake_firmware/core.domain_objects.xml b/userdata/anna_heatpump_cooling_fake_firmware/core.domain_objects.xml index 7749e9595..ad470f749 100644 --- a/userdata/anna_heatpump_cooling_fake_firmware/core.domain_objects.xml +++ b/userdata/anna_heatpump_cooling_fake_firmware/core.domain_objects.xml @@ -1096,6 +1096,16 @@ + + + cooling_enabled + + 2022-05-19T08:54:06.913+02:00 + 2022-05-20T14:39:43.261+02:00 + + on + + 2020-04-16T17:24:09.995+02:00 outdoor_temperature @@ -1450,7 +1460,7 @@ 2020-04-16T17:23:11.761+02:00 - 0.40 + 1.00 From c916231cf0560829e800e9ab2c1b45fd8014ce30 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 6 Jan 2024 19:39:36 +0100 Subject: [PATCH 058/306] Update userdata 6 --- .../core.domain_objects.xml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/userdata/anna_elga_no_cooling/core.domain_objects.xml b/userdata/anna_elga_no_cooling/core.domain_objects.xml index a19fe04e5..9cf33cc7a 100644 --- a/userdata/anna_elga_no_cooling/core.domain_objects.xml +++ b/userdata/anna_elga_no_cooling/core.domain_objects.xml @@ -322,7 +322,7 @@ C 2020-04-09T13:51:55.147+02:00 - 18.00 + 3.00 @@ -382,7 +382,7 @@ C 2020-04-03T07:54:47.729+02:00 - 0.00 + 35.00 @@ -869,6 +869,16 @@ + + 2020-04-08T19:24:38.964+02:00 + domestic_hot_water_setpoint + 53 + 35 + 60 + 0.01 + + + 2020-04-09T13:25:35.254+02:00 @@ -1145,7 +1155,7 @@ 2020-04-08T19:05:35.819+02:00 - 23.30 + 19.30 @@ -1343,7 +1353,7 @@ C 2020-04-09T14:12:19.497+02:00 - 23.30 + 19.30 From 4272174d55498cb2630d75693b0225430154598d Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 6 Jan 2024 19:40:54 +0100 Subject: [PATCH 059/306] Update userdata 7 --- userdata/anna_elga_2/core.domain_objects.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userdata/anna_elga_2/core.domain_objects.xml b/userdata/anna_elga_2/core.domain_objects.xml index c58b370e1..ccc30bccb 100644 --- a/userdata/anna_elga_2/core.domain_objects.xml +++ b/userdata/anna_elga_2/core.domain_objects.xml @@ -1461,7 +1461,7 @@ PT3H - 13.00 + 14.00 From d3e5b029735f805c8ec9cd28c23d35c2e985081b Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 6 Jan 2024 19:44:46 +0100 Subject: [PATCH 060/306] Update userdata 8 --- userdata/anna_elga_2/core.domain_objects.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/userdata/anna_elga_2/core.domain_objects.xml b/userdata/anna_elga_2/core.domain_objects.xml index ccc30bccb..44c04e634 100644 --- a/userdata/anna_elga_2/core.domain_objects.xml +++ b/userdata/anna_elga_2/core.domain_objects.xml @@ -1464,6 +1464,17 @@ 14.00 + + cooling_enabled + + 2022-11-02T03:57:23.207+01:00 + 2022-11-02T03:57:23.207+01:00 + + + + off + + From 68cf9fc576f61dc4cdac1e5e12711935d648e0fa Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 6 Jan 2024 19:46:05 +0100 Subject: [PATCH 061/306] Update userdata 9 --- .../anna_elga_2_schedule_off/core.domain_objects.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/userdata/anna_elga_2_schedule_off/core.domain_objects.xml b/userdata/anna_elga_2_schedule_off/core.domain_objects.xml index 5fab591be..afcfa65fa 100644 --- a/userdata/anna_elga_2_schedule_off/core.domain_objects.xml +++ b/userdata/anna_elga_2_schedule_off/core.domain_objects.xml @@ -1464,6 +1464,17 @@ 13.00 + + cooling_enabled + + 2022-11-02T03:57:23.207+01:00 + 2022-11-02T03:57:23.207+01:00 + + + + off + + From 6b08d42f2e2adbf4fac2760c5d1ed4f01ad46fca Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 6 Jan 2024 19:58:08 +0100 Subject: [PATCH 062/306] Update userdata 10 --- .../core.domain_objects.xml | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/userdata/anna_elga_2_cooling/core.domain_objects.xml b/userdata/anna_elga_2_cooling/core.domain_objects.xml index 53854c286..5abf66cb2 100644 --- a/userdata/anna_elga_2_cooling/core.domain_objects.xml +++ b/userdata/anna_elga_2_cooling/core.domain_objects.xml @@ -401,7 +401,7 @@ PT3H - 20.93 + 24.93 @@ -456,7 +456,7 @@ - 19.50 + 23.00 @@ -533,7 +533,7 @@ 2022-03-10T06:45:00.390+01:00 thermostat - 19.5 + 23.0 4 30 0.1 @@ -1464,6 +1464,17 @@ 30.00 + + cooling_enabled + + 2022-11-02T03:57:23.207+01:00 + 2022-11-02T03:57:23.207+01:00 + + + + on + + @@ -1839,7 +1850,7 @@ 2022-03-02T06:45:00.397+01:00 - 19.50 + 23.00 @@ -1849,7 +1860,7 @@ 2022-03-02T17:29:58.913+01:00 PT3H - 20.93 + 24.93 @@ -1857,7 +1868,7 @@ 2022-03-10T06:45:00.348+01:00 thermostat - 19.5 + 23.0 4 30 0.1 From d41f02ccce5aed61573401e878e7659fbca292f9 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 6 Jan 2024 19:59:20 +0100 Subject: [PATCH 063/306] Fix 23 --- tests/data/anna/anna_loria_heating_idle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/anna/anna_loria_heating_idle.json b/tests/data/anna/anna_loria_heating_idle.json index 05893ff0f..72a222c21 100644 --- a/tests/data/anna/anna_loria_heating_idle.json +++ b/tests/data/anna/anna_loria_heating_idle.json @@ -59,7 +59,7 @@ "intended_boiler_temperature": 0, "modulation_level": 0, "return_temperature": 26.3, - "outdoor_air_temperature": 17.3 + "outdoor_air_temperature": 17.2 }, "switches": { "dhw_cm_switch": true, From ddabb46c71a01303bfdf8fcfc0b14028753863ab Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 6 Jan 2024 20:04:50 +0100 Subject: [PATCH 064/306] Update userdata 11 --- userdata/anna_loria_cooling_active/core.domain_objects.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userdata/anna_loria_cooling_active/core.domain_objects.xml b/userdata/anna_loria_cooling_active/core.domain_objects.xml index 3e989e5f1..4099fd7db 100644 --- a/userdata/anna_loria_cooling_active/core.domain_objects.xml +++ b/userdata/anna_loria_cooling_active/core.domain_objects.xml @@ -1465,7 +1465,7 @@ 2022-09-29T16:34:13.146+02:00 cooling_enabled - off + on From 4b78678367d5c6723eee987945cef95145fb727a Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 6 Jan 2024 20:10:15 +0100 Subject: [PATCH 065/306] Fix 24 --- tests/data/anna/anna_loria_cooling_active.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/anna/anna_loria_cooling_active.json b/tests/data/anna/anna_loria_cooling_active.json index 73281903d..f2beee0fc 100644 --- a/tests/data/anna/anna_loria_cooling_active.json +++ b/tests/data/anna/anna_loria_cooling_active.json @@ -59,7 +59,7 @@ "intended_boiler_temperature": 0, "modulation_level": 100, "return_temperature": 26.3, - "outdoor_air_temperature": 17.3 + "outdoor_air_temperature": 17.2 }, "switches": { "dhw_cm_switch": true, From 8acae5b25d8797da0802ffcd8fef68aa6b3f4d37 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 6 Jan 2024 20:13:35 +0100 Subject: [PATCH 066/306] Fix 25 --- tests/data/anna/anna_loria_driessens.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/anna/anna_loria_driessens.json b/tests/data/anna/anna_loria_driessens.json index 71cae23f6..ec10b5f7c 100644 --- a/tests/data/anna/anna_loria_driessens.json +++ b/tests/data/anna/anna_loria_driessens.json @@ -84,7 +84,7 @@ "dhw_temperature": 49.5, "intended_boiler_temperature": 0, "modulation_level": 0, - "outdoor_air_temperature": 7.63, + "outdoor_air_temperature": 7.5, "return_temperature": 23, "water_temperature": 23.3 }, From d1cf170c3f49d623e8b9511a3f9449c361229c98 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 6 Jan 2024 20:17:06 +0100 Subject: [PATCH 067/306] Fix 26 --- tests/data/p1/p1v4.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/data/p1/p1v4.json b/tests/data/p1/p1v4.json index c9a4c12b0..1a4280c8b 100644 --- a/tests/data/p1/p1v4.json +++ b/tests/data/p1/p1v4.json @@ -20,8 +20,8 @@ "vendor": "SHENZHEN KAIFA TECHNOLOGY CHENGDU CO.", "available": false, "sensors": { - "net_electricity_point": 548, - "electricity_consumed_peak_point": 548, + "net_electricity_point": 571, + "electricity_consumed_peak_point": 571, "electricity_consumed_off_peak_point": 0, "net_electricity_cumulative": 20983.453, "electricity_consumed_peak_cumulative": 9067.554, From d36c6b9d57a1a00a067d99a9bed8b3c6c5818148 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 6 Jan 2024 20:21:49 +0100 Subject: [PATCH 068/306] Fix 27 --- tests/data/p1/p1v4_442_single.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/data/p1/p1v4_442_single.json b/tests/data/p1/p1v4_442_single.json index 98158bda5..b7f144d96 100644 --- a/tests/data/p1/p1v4_442_single.json +++ b/tests/data/p1/p1v4_442_single.json @@ -20,21 +20,21 @@ "vendor": "SHENZHEN KAIFA TECHNOLOGY （CHENGDU） CO., LTD.", "available": true, "sensors": { - "net_electricity_point": 421, + "net_electricity_point": 486, "electricity_consumed_peak_point": 0, - "electricity_consumed_off_peak_point": 421, - "net_electricity_cumulative": 31610.113, + "electricity_consumed_off_peak_point": 486, + "net_electricity_cumulative": 31610.031, "electricity_consumed_peak_cumulative": 13966.608, - "electricity_consumed_off_peak_cumulative": 17643.505, + "electricity_consumed_off_peak_cumulative": 17643.423, "electricity_consumed_peak_interval": 0, - "electricity_consumed_off_peak_interval": 21, + "electricity_consumed_off_peak_interval": 15, "electricity_produced_peak_point": 0, "electricity_produced_off_peak_point": 0, "electricity_produced_peak_cumulative": 0, "electricity_produced_off_peak_cumulative": 0, "electricity_produced_peak_interval": 0, "electricity_produced_off_peak_interval": 0, - "electricity_phase_one_consumed": 413, + "electricity_phase_one_consumed": 414863, "electricity_phase_one_produced": 0 } } From 7865fe4f04c898ccb462a6075a2152c9ce32e978 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 6 Jan 2024 20:22:53 +0100 Subject: [PATCH 069/306] Fix --- tests/data/p1/p1v4_442_single.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/p1/p1v4_442_single.json b/tests/data/p1/p1v4_442_single.json index b7f144d96..ec317cd58 100644 --- a/tests/data/p1/p1v4_442_single.json +++ b/tests/data/p1/p1v4_442_single.json @@ -34,7 +34,7 @@ "electricity_produced_off_peak_cumulative": 0, "electricity_produced_peak_interval": 0, "electricity_produced_off_peak_interval": 0, - "electricity_phase_one_consumed": 414863, + "electricity_phase_one_consumed": 486, "electricity_phase_one_produced": 0 } } From 9c6eede05d0e25694d10b77d0bb5cdeeebda0be8 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 7 Jan 2024 09:50:29 +0100 Subject: [PATCH 070/306] Update updated userdata 11 --- .../p1v4_442_single/core.domain_objects.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/userdata/updated/p1v4_442_single/core.domain_objects.xml b/userdata/updated/p1v4_442_single/core.domain_objects.xml index d598bc539..ff91c4766 100644 --- a/userdata/updated/p1v4_442_single/core.domain_objects.xml +++ b/userdata/updated/p1v4_442_single/core.domain_objects.xml @@ -186,7 +186,7 @@ - 0.00 + 1998.00 @@ -198,7 +198,7 @@ 0.00 - 486.00 + 0.00 @@ -209,7 +209,7 @@ - 0.00 + 6543.00 0.00 @@ -221,7 +221,7 @@ - 486.00 + 0.00 @@ -232,7 +232,7 @@ - 0.00 + 2248.00 0.00 @@ -245,7 +245,7 @@ 13966608.00 - 17643423.00 + 17643505.00 @@ -256,7 +256,7 @@ PT5M - 0.00 + 1345.00 0.00 @@ -269,7 +269,7 @@ 0.00 - 15.00 + 0.00 From 0c3ac03a6c7203058a93a4e176c40b0a0717f4b6 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 7 Jan 2024 10:02:13 +0100 Subject: [PATCH 071/306] Update userdata 12 --- .../p1v4_442_triple/core.domain_objects.xml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/userdata/p1v4_442_triple/core.domain_objects.xml b/userdata/p1v4_442_triple/core.domain_objects.xml index cce3e20af..3ea8e53a5 100644 --- a/userdata/p1v4_442_triple/core.domain_objects.xml +++ b/userdata/p1v4_442_triple/core.domain_objects.xml @@ -148,7 +148,7 @@ - 235.40 + 234.70 @@ -159,7 +159,7 @@ - 233.60 + 233.20 @@ -170,7 +170,7 @@ - 2800.00 + 1763.00 @@ -182,7 +182,7 @@ 0.00 - 0.00 + 314.00 @@ -193,7 +193,7 @@ - 1714.00 + 1703.00 @@ -226,7 +226,7 @@ PT1H - 0.86 + 0.06 @@ -237,7 +237,7 @@ - 2203.00 + 2080.00 @@ -260,7 +260,7 @@ - 235.20 + 234.40 @@ -272,7 +272,7 @@ 0.00 - 5461.00 + 5553.00 @@ -283,7 +283,7 @@ - 16811.08 + 16811.37 @@ -295,7 +295,7 @@ 161328641.00 - 70536807.00 + 70537898.00 From 9babcde6ce0658e2aed529fd5642cadc4827e1a5 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 7 Jan 2024 10:11:05 +0100 Subject: [PATCH 072/306] Add pragma-no-cover --- plugwise/helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugwise/helper.py b/plugwise/helper.py index b6f05d197..c657cf49d 100644 --- a/plugwise/helper.py +++ b/plugwise/helper.py @@ -403,7 +403,7 @@ def _appliance_info_finder(self, appliance: etree, appl: Munch) -> Munch: if appl.pwclass == "heater_central": # Remove heater_central when no active device present if not self._opentherm_device and not self._on_off_device: - return None + return None # pragma: no cover # Find the valid heater_central self._heater_id = self._check_heater_central() From 67c314682bd73358e86bf96c573c84716c6e398f Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 7 Jan 2024 10:16:12 +0100 Subject: [PATCH 073/306] Update adam_plus_anna userdata to cover helper.py line 524 --- .../adam_plus_anna/core.domain_objects.xml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/userdata/adam_plus_anna/core.domain_objects.xml b/userdata/adam_plus_anna/core.domain_objects.xml index 370fcfeed..1cb357ea3 100644 --- a/userdata/adam_plus_anna/core.domain_objects.xml +++ b/userdata/adam_plus_anna/core.domain_objects.xml @@ -1,5 +1,29 @@ + + OpenThermThermostat + A Thermostat + thermostat + 2020-06-03T00:26:51.308+02:00 + 2020-07-31T16:04:57.153+02:00 + + + + + + maximum_modulation_level + + 2020-07-31T08:12:56.454+02:00 + 2020-06-03T00:27:08.401+02:00 + + + + 1.00 + + + + + Plugwise 160-01 From ffbad48d0b7a1ea4f7b4707bfa2692b5b3debcf7 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 7 Jan 2024 10:17:29 +0100 Subject: [PATCH 074/306] Save updated fixtures --- fixtures/adam_heatpump_cooling/all_data.json | 86 +++---------------- fixtures/adam_jip/all_data.json | 61 +++---------- .../all_data.json | 40 ++------- .../all_data.json | 14 +-- fixtures/adam_plus_anna/all_data.json | 13 +-- fixtures/adam_plus_anna_new/all_data.json | 29 +------ fixtures/adam_zone_per_device/all_data.json | 40 ++------- .../anna_elga_2_schedule_off/all_data.json | 2 +- fixtures/anna_heatpump_cooling/all_data.json | 2 +- .../all_data.json | 2 +- .../anna_loria_cooling_active/all_data.json | 2 +- fixtures/anna_loria_driessens/all_data.json | 2 +- .../anna_loria_heating_idle/all_data.json | 2 +- fixtures/anna_v4/all_data.json | 14 +-- fixtures/anna_v4_dhw/all_data.json | 12 +-- fixtures/anna_v4_no_tag/all_data.json | 12 +-- fixtures/m_adam_jip/all_data.json | 2 +- fixtures/m_adam_jip/device_list.json | 12 +-- fixtures/p1v4/all_data.json | 4 +- fixtures/p1v4_442_single/all_data.json | 12 +-- 20 files changed, 74 insertions(+), 289 deletions(-) diff --git a/fixtures/adam_heatpump_cooling/all_data.json b/fixtures/adam_heatpump_cooling/all_data.json index 3d8843816..4653f324c 100644 --- a/fixtures/adam_heatpump_cooling/all_data.json +++ b/fixtures/adam_heatpump_cooling/all_data.json @@ -55,13 +55,7 @@ "mode": "cool", "model": "Lisa", "name": "Thermostaat BK", - "preset_modes": [ - "no_frost", - "vacation", - "away", - "home", - "asleep" - ], + "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], "select_schedule": "off", "sensors": { "battery": 55, @@ -176,13 +170,7 @@ "mode": "cool", "model": "Lisa", "name": "Thermostaat DB", - "preset_modes": [ - "no_frost", - "vacation", - "away", - "home", - "asleep" - ], + "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], "select_schedule": "off", "sensors": { "setpoint": 18.0, @@ -228,11 +216,7 @@ }, "dev_class": "gateway", "firmware": "3.2.8", - "gateway_modes": [ - "away", - "full", - "vacation" - ], + "gateway_modes": ["away", "full", "vacation"], "hardware": "AME Smile 2.0 board", "location": "eedadcb297564f1483faa509179aebed", "mac_address": "012345670001", @@ -270,13 +254,7 @@ "mode": "cool", "model": "Lisa", "name": "Thermostaat JM", - "preset_modes": [ - "no_frost", - "vacation", - "away", - "home", - "asleep" - ], + "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], "select_schedule": "off", "sensors": { "setpoint": 18.0, @@ -409,13 +387,7 @@ "mode": "cool", "model": "Lisa", "name": "Thermostaat SQ", - "preset_modes": [ - "no_frost", - "vacation", - "away", - "home", - "asleep" - ], + "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], "select_schedule": "off", "sensors": { "setpoint": 18.5, @@ -453,13 +425,7 @@ "mode": "cool", "model": "Lisa", "name": "Thermostaat RB", - "preset_modes": [ - "no_frost", - "vacation", - "away", - "home", - "asleep" - ], + "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], "select_schedule": "off", "sensors": { "setpoint": 17.0, @@ -494,13 +460,7 @@ "mode": "auto", "model": "ThermoTouch", "name": "Thermostaat WK", - "preset_modes": [ - "no_frost", - "vacation", - "away", - "home", - "asleep" - ], + "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], "select_schedule": "Werkdag schema", "sensors": { "setpoint": 21.5, @@ -531,13 +491,7 @@ "mode": "cool", "model": "Lisa", "name": "Thermostaat SJ", - "preset_modes": [ - "no_frost", - "vacation", - "away", - "home", - "asleep" - ], + "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], "select_schedule": "off", "sensors": { "setpoint": 20.5, @@ -575,13 +529,7 @@ "mode": "auto", "model": "Lisa", "name": "Thermostaat KK", - "preset_modes": [ - "no_frost", - "vacation", - "away", - "home", - "asleep" - ], + "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], "select_schedule": "Werkdag schema", "sensors": { "battery": 53, @@ -620,13 +568,7 @@ "mode": "auto", "model": "Lisa", "name": "Thermostaat BK1", - "preset_modes": [ - "no_frost", - "vacation", - "away", - "home", - "asleep" - ], + "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], "select_schedule": "Werkdag schema", "sensors": { "setpoint": 20.5, @@ -664,13 +606,7 @@ "mode": "auto", "model": "Lisa", "name": "Thermostaat BK2", - "preset_modes": [ - "no_frost", - "vacation", - "away", - "home", - "asleep" - ], + "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], "select_schedule": "Werkdag schema", "sensors": { "setpoint": 20.5, diff --git a/fixtures/adam_jip/all_data.json b/fixtures/adam_jip/all_data.json index 549ead193..3f0c48d89 100644 --- a/fixtures/adam_jip/all_data.json +++ b/fixtures/adam_jip/all_data.json @@ -3,9 +3,7 @@ "1346fbd8498d4dbcab7e18d51b771f3d": { "active_preset": "no_frost", "available": true, - "available_schedules": [ - "None" - ], + "available_schedules": ["None"], "control_state": "off", "dev_class": "zone_thermostat", "firmware": "2016-10-27T02:00:00+02:00", @@ -14,13 +12,7 @@ "mode": "heat", "model": "Lisa", "name": "Slaapkamer", - "preset_modes": [ - "home", - "asleep", - "away", - "vacation", - "no_frost" - ], + "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "select_schedule": "None", "sensors": { "battery": 92, @@ -107,9 +99,7 @@ "6f3e9d7084214c21b9dfa46f6eeb8700": { "active_preset": "home", "available": true, - "available_schedules": [ - "None" - ], + "available_schedules": ["None"], "control_state": "off", "dev_class": "zone_thermostat", "firmware": "2016-10-27T02:00:00+02:00", @@ -118,13 +108,7 @@ "mode": "heat", "model": "Lisa", "name": "Kinderkamer", - "preset_modes": [ - "home", - "asleep", - "away", - "vacation", - "no_frost" - ], + "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "select_schedule": "None", "sensors": { "battery": 79, @@ -172,9 +156,7 @@ "a6abc6a129ee499c88a4d420cc413b47": { "active_preset": "home", "available": true, - "available_schedules": [ - "None" - ], + "available_schedules": ["None"], "control_state": "off", "dev_class": "zone_thermostat", "firmware": "2016-10-27T02:00:00+02:00", @@ -183,13 +165,7 @@ "mode": "heat", "model": "Lisa", "name": "Logeerkamer", - "preset_modes": [ - "home", - "asleep", - "away", - "vacation", - "no_frost" - ], + "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "select_schedule": "None", "sensors": { "battery": 80, @@ -217,22 +193,13 @@ }, "dev_class": "gateway", "firmware": "3.2.8", - "gateway_modes": [ - "away", - "full", - "vacation" - ], + "gateway_modes": ["away", "full", "vacation"], "hardware": "AME Smile 2.0 board", "location": "9e4433a9d69f40b3aefd15e74395eaec", "mac_address": "012345670001", "model": "Gateway", "name": "Adam", - "regulation_modes": [ - "heating", - "off", - "bleeding_cold", - "bleeding_hot" - ], + "regulation_modes": ["heating", "off", "bleeding_cold", "bleeding_hot"], "select_gateway_mode": "full", "select_regulation_mode": "heating", "sensors": { @@ -302,9 +269,7 @@ "f61f1a2535f54f52ad006a3d18e459ca": { "active_preset": "home", "available": true, - "available_schedules": [ - "None" - ], + "available_schedules": ["None"], "control_state": "off", "dev_class": "zone_thermometer", "firmware": "2020-09-01T02:00:00+02:00", @@ -313,13 +278,7 @@ "mode": "heat", "model": "Jip", "name": "Woonkamer", - "preset_modes": [ - "home", - "asleep", - "away", - "vacation", - "no_frost" - ], + "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "select_schedule": "None", "sensors": { "battery": 100, diff --git a/fixtures/adam_multiple_devices_per_zone/all_data.json b/fixtures/adam_multiple_devices_per_zone/all_data.json index 557062e1b..47c8e4dce 100644 --- a/fixtures/adam_multiple_devices_per_zone/all_data.json +++ b/fixtures/adam_multiple_devices_per_zone/all_data.json @@ -122,13 +122,7 @@ "mode": "auto", "model": "Lisa", "name": "Zone Thermostat Jessie", - "preset_modes": [ - "home", - "asleep", - "away", - "vacation", - "no_frost" - ], + "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "select_schedule": "CV Jessie", "sensors": { "battery": 37, @@ -268,13 +262,7 @@ "mode": "auto", "model": "Lisa", "name": "Zone Lisa WK", - "preset_modes": [ - "home", - "asleep", - "away", - "vacation", - "no_frost" - ], + "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "select_schedule": "GF7 Woonkamer", "sensors": { "battery": 34, @@ -358,13 +346,7 @@ "mode": "heat", "model": "Lisa", "name": "Zone Lisa Bios", - "preset_modes": [ - "home", - "asleep", - "away", - "vacation", - "no_frost" - ], + "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "select_schedule": "off", "sensors": { "battery": 67, @@ -404,13 +386,7 @@ "mode": "heat", "model": "Tom/Floor", "name": "CV Kraan Garage", - "preset_modes": [ - "home", - "asleep", - "away", - "vacation", - "no_frost" - ], + "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "select_schedule": "off", "sensors": { "battery": 68, @@ -452,13 +428,7 @@ "mode": "auto", "model": "Lisa", "name": "Zone Thermostat Badkamer", - "preset_modes": [ - "home", - "asleep", - "away", - "vacation", - "no_frost" - ], + "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "select_schedule": "Badkamer Schema", "sensors": { "battery": 92, diff --git a/fixtures/adam_onoff_cooling_fake_firmware/all_data.json b/fixtures/adam_onoff_cooling_fake_firmware/all_data.json index edba7d14d..18567e57a 100644 --- a/fixtures/adam_onoff_cooling_fake_firmware/all_data.json +++ b/fixtures/adam_onoff_cooling_fake_firmware/all_data.json @@ -42,11 +42,7 @@ }, "dev_class": "gateway", "firmware": "3.2.8", - "gateway_modes": [ - "away", - "full", - "vacation" - ], + "gateway_modes": ["away", "full", "vacation"], "hardware": "AME Smile 2.0 board", "location": "eedadcb297564f1483faa509179aebed", "mac_address": "012345670001", @@ -81,13 +77,7 @@ "mode": "auto", "model": "ThermoTouch", "name": "Thermostaat WK", - "preset_modes": [ - "no_frost", - "vacation", - "away", - "home", - "asleep" - ], + "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"], "select_schedule": "Werkdag schema", "sensors": { "setpoint": 21.5, diff --git a/fixtures/adam_plus_anna/all_data.json b/fixtures/adam_plus_anna/all_data.json index 6ac8023a3..ba5f0dc42 100644 --- a/fixtures/adam_plus_anna/all_data.json +++ b/fixtures/adam_plus_anna/all_data.json @@ -65,22 +65,13 @@ }, "ee62cad889f94e8ca3d09021f03a660b": { "active_preset": "home", - "available_schedules": [ - "Weekschema", - "off" - ], + "available_schedules": ["Weekschema", "off"], "dev_class": "thermostat", "location": "009490cc2f674ce6b576863fbb64f867", "mode": "auto", "model": "ThermoTouch", "name": "Anna", - "preset_modes": [ - "home", - "asleep", - "away", - "vacation", - "no_frost" - ], + "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "select_schedule": "Weekschema", "sensors": { "setpoint": 20.5, diff --git a/fixtures/adam_plus_anna_new/all_data.json b/fixtures/adam_plus_anna_new/all_data.json index 8fa09e2fe..a9358167a 100644 --- a/fixtures/adam_plus_anna_new/all_data.json +++ b/fixtures/adam_plus_anna_new/all_data.json @@ -139,13 +139,7 @@ "mode": "auto", "model": "ThermoTouch", "name": "Anna", - "preset_modes": [ - "no_frost", - "asleep", - "vacation", - "home", - "away" - ], + "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"], "select_schedule": "Weekschema", "sensors": { "setpoint": 18.5, @@ -165,22 +159,13 @@ }, "dev_class": "gateway", "firmware": "3.7.8", - "gateway_modes": [ - "away", - "full", - "vacation" - ], + "gateway_modes": ["away", "full", "vacation"], "hardware": "AME Smile 2.0 board", "location": "bc93488efab249e5bc54fd7e175a6f91", "mac_address": "012345679891", "model": "Gateway", "name": "Adam", - "regulation_modes": [ - "bleeding_hot", - "bleeding_cold", - "off", - "heating" - ], + "regulation_modes": ["bleeding_hot", "bleeding_cold", "off", "heating"], "select_gateway_mode": "full", "select_regulation_mode": "heating", "sensors": { @@ -207,13 +192,7 @@ "mode": "auto", "model": "Lisa", "name": "Lisa Badkamer", - "preset_modes": [ - "no_frost", - "asleep", - "vacation", - "home", - "away" - ], + "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"], "select_schedule": "Badkamer", "sensors": { "battery": 38, diff --git a/fixtures/adam_zone_per_device/all_data.json b/fixtures/adam_zone_per_device/all_data.json index 39f46d4cb..dfc599f84 100644 --- a/fixtures/adam_zone_per_device/all_data.json +++ b/fixtures/adam_zone_per_device/all_data.json @@ -122,13 +122,7 @@ "mode": "auto", "model": "Lisa", "name": "Zone Thermostat Jessie", - "preset_modes": [ - "home", - "asleep", - "away", - "vacation", - "no_frost" - ], + "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "select_schedule": "CV Jessie", "sensors": { "battery": 37, @@ -268,13 +262,7 @@ "mode": "auto", "model": "Lisa", "name": "Zone Lisa WK", - "preset_modes": [ - "home", - "asleep", - "away", - "vacation", - "no_frost" - ], + "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "select_schedule": "GF7 Woonkamer", "sensors": { "battery": 34, @@ -358,13 +346,7 @@ "mode": "heat", "model": "Lisa", "name": "Zone Lisa Bios", - "preset_modes": [ - "home", - "asleep", - "away", - "vacation", - "no_frost" - ], + "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "select_schedule": "off", "sensors": { "battery": 67, @@ -404,13 +386,7 @@ "mode": "heat", "model": "Tom/Floor", "name": "CV Kraan Garage", - "preset_modes": [ - "home", - "asleep", - "away", - "vacation", - "no_frost" - ], + "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "select_schedule": "off", "sensors": { "battery": 68, @@ -452,13 +428,7 @@ "mode": "auto", "model": "Lisa", "name": "Zone Thermostat Badkamer", - "preset_modes": [ - "home", - "asleep", - "away", - "vacation", - "no_frost" - ], + "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"], "select_schedule": "Badkamer Schema", "sensors": { "battery": 92, diff --git a/fixtures/anna_elga_2_schedule_off/all_data.json b/fixtures/anna_elga_2_schedule_off/all_data.json index 5fb99ddaa..1d502983e 100644 --- a/fixtures/anna_elga_2_schedule_off/all_data.json +++ b/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 diff --git a/fixtures/anna_heatpump_cooling/all_data.json b/fixtures/anna_heatpump_cooling/all_data.json index 3367d32a9..95cceaa49 100644 --- a/fixtures/anna_heatpump_cooling/all_data.json +++ b/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 diff --git a/fixtures/anna_heatpump_cooling_fake_firmware/all_data.json b/fixtures/anna_heatpump_cooling_fake_firmware/all_data.json index 9d0b3b546..71cff7131 100644 --- a/fixtures/anna_heatpump_cooling_fake_firmware/all_data.json +++ b/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 diff --git a/fixtures/anna_loria_cooling_active/all_data.json b/fixtures/anna_loria_cooling_active/all_data.json index 2e68ccc5a..2739ec496 100644 --- a/fixtures/anna_loria_cooling_active/all_data.json +++ b/fixtures/anna_loria_cooling_active/all_data.json @@ -79,7 +79,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 }, diff --git a/fixtures/anna_loria_driessens/all_data.json b/fixtures/anna_loria_driessens/all_data.json index 5af80a68e..3d07b4ec2 100644 --- a/fixtures/anna_loria_driessens/all_data.json +++ b/fixtures/anna_loria_driessens/all_data.json @@ -85,7 +85,7 @@ "dhw_temperature": 49.5, "intended_boiler_temperature": 0.0, "modulation_level": 0.0, - "outdoor_air_temperature": 7.63, + "outdoor_air_temperature": 7.5, "return_temperature": 23.0, "water_temperature": 23.3 }, diff --git a/fixtures/anna_loria_heating_idle/all_data.json b/fixtures/anna_loria_heating_idle/all_data.json index 4e7dd248c..8df0cd1bd 100644 --- a/fixtures/anna_loria_heating_idle/all_data.json +++ b/fixtures/anna_loria_heating_idle/all_data.json @@ -79,7 +79,7 @@ "dhw_temperature": 52.9, "intended_boiler_temperature": 0.0, "modulation_level": 0.0, - "outdoor_air_temperature": 17.3, + "outdoor_air_temperature": 17.2, "return_temperature": 26.3, "water_temperature": 25.3 }, diff --git a/fixtures/anna_v4/all_data.json b/fixtures/anna_v4/all_data.json index 160edc44d..1716ed40b 100644 --- a/fixtures/anna_v4/all_data.json +++ b/fixtures/anna_v4/all_data.json @@ -2,11 +2,7 @@ "devices": { "01b85360fdd243d0aaad4d6ac2a5ba7e": { "active_preset": "home", - "available_schedules": [ - "Standaard", - "Thuiswerken", - "off" - ], + "available_schedules": ["Standaard", "Thuiswerken", "off"], "dev_class": "thermostat", "firmware": "2018-02-08T11:15:53+01:00", "hardware": "6539-1301-5002", @@ -14,13 +10,7 @@ "mode": "heat", "model": "ThermoTouch", "name": "Anna", - "preset_modes": [ - "vacation", - "no_frost", - "away", - "asleep", - "home" - ], + "preset_modes": ["vacation", "no_frost", "away", "asleep", "home"], "select_schedule": "off", "sensors": { "illuminance": 60.0, diff --git a/fixtures/anna_v4_dhw/all_data.json b/fixtures/anna_v4_dhw/all_data.json index fe2a1f9b2..cc0a04d77 100644 --- a/fixtures/anna_v4_dhw/all_data.json +++ b/fixtures/anna_v4_dhw/all_data.json @@ -13,9 +13,9 @@ "preset_modes": ["vacation", "no_frost", "away", "asleep", "home"], "select_schedule": "off", "sensors": { - "illuminance": 40.5, + "illuminance": 60.0, "setpoint": 20.5, - "temperature": 20.5 + "temperature": 20.6 }, "temperature_offset": { "lower_bound": -2.0, @@ -71,11 +71,11 @@ "model": "2.32", "name": "OpenTherm", "sensors": { - "intended_boiler_temperature": 48.6, + "intended_boiler_temperature": 39.9, "modulation_level": 0.0, - "return_temperature": 42.0, - "water_pressure": 2.1, - "water_temperature": 52.0 + "return_temperature": 32.0, + "water_pressure": 2.2, + "water_temperature": 45.0 }, "switches": { "dhw_cm_switch": false diff --git a/fixtures/anna_v4_no_tag/all_data.json b/fixtures/anna_v4_no_tag/all_data.json index e21c1d6fc..a0644f415 100644 --- a/fixtures/anna_v4_no_tag/all_data.json +++ b/fixtures/anna_v4_no_tag/all_data.json @@ -13,9 +13,9 @@ "preset_modes": ["vacation", "no_frost", "away", "asleep", "home"], "select_schedule": "Thuiswerken", "sensors": { - "illuminance": 40.5, + "illuminance": 60.0, "setpoint": 20.5, - "temperature": 20.5 + "temperature": 20.6 }, "temperature_offset": { "lower_bound": -2.0, @@ -71,11 +71,11 @@ "model": "2.32", "name": "OpenTherm", "sensors": { - "intended_boiler_temperature": 48.6, + "intended_boiler_temperature": 39.9, "modulation_level": 0.0, - "return_temperature": 42.0, - "water_pressure": 2.1, - "water_temperature": 52.0 + "return_temperature": 32.0, + "water_pressure": 2.2, + "water_temperature": 45.0 }, "switches": { "dhw_cm_switch": false diff --git a/fixtures/m_adam_jip/all_data.json b/fixtures/m_adam_jip/all_data.json index 915f438c1..378a5e0a7 100644 --- a/fixtures/m_adam_jip/all_data.json +++ b/fixtures/m_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 }, diff --git a/fixtures/m_adam_jip/device_list.json b/fixtures/m_adam_jip/device_list.json index 049845bc8..356cbad14 100644 --- a/fixtures/m_adam_jip/device_list.json +++ b/fixtures/m_adam_jip/device_list.json @@ -1,13 +1,13 @@ [ "b5c2386c6f6342669e50fe49dd05b188", "e4684553153b44afbef2200885f379dc", - "a6abc6a129ee499c88a4d420cc413b47", - "1346fbd8498d4dbcab7e18d51b771f3d", - "833de10f269c4deab58fb9df69901b4e", "6f3e9d7084214c21b9dfa46f6eeb8700", - "f61f1a2535f54f52ad006a3d18e459ca", "d4496250d0e942cfa7aea3476e9070d5", + "a6abc6a129ee499c88a4d420cc413b47", + "833de10f269c4deab58fb9df69901b4e", "356b65335e274d769c338223e7af9c33", - "1da4d325838e4ad8aac12177214505c9", - "457ce8414de24596a2d5e7dbc9c7682f" + "1346fbd8498d4dbcab7e18d51b771f3d", + "457ce8414de24596a2d5e7dbc9c7682f", + "f61f1a2535f54f52ad006a3d18e459ca", + "1da4d325838e4ad8aac12177214505c9" ] diff --git a/fixtures/p1v4/all_data.json b/fixtures/p1v4/all_data.json index 95dfdf7f2..4d841de79 100644 --- a/fixtures/p1v4/all_data.json +++ b/fixtures/p1v4/all_data.json @@ -25,7 +25,7 @@ "electricity_consumed_off_peak_point": 0, "electricity_consumed_peak_cumulative": 9067.554, "electricity_consumed_peak_interval": 335, - "electricity_consumed_peak_point": 548, + "electricity_consumed_peak_point": 571, "electricity_produced_off_peak_cumulative": 0.0, "electricity_produced_off_peak_interval": 0, "electricity_produced_off_peak_point": 0, @@ -33,7 +33,7 @@ "electricity_produced_peak_interval": 0, "electricity_produced_peak_point": 0, "net_electricity_cumulative": 20983.453, - "net_electricity_point": 548 + "net_electricity_point": 571 }, "vendor": "SHENZHEN KAIFA TECHNOLOGY CHENGDU CO." } diff --git a/fixtures/p1v4_442_single/all_data.json b/fixtures/p1v4_442_single/all_data.json index 731191ec0..318035a5d 100644 --- a/fixtures/p1v4_442_single/all_data.json +++ b/fixtures/p1v4_442_single/all_data.json @@ -20,13 +20,13 @@ "model": "KFM5KAIFA-METER", "name": "P1", "sensors": { - "electricity_consumed_off_peak_cumulative": 17643.505, - "electricity_consumed_off_peak_interval": 21, - "electricity_consumed_off_peak_point": 421, + "electricity_consumed_off_peak_cumulative": 17643.423, + "electricity_consumed_off_peak_interval": 15, + "electricity_consumed_off_peak_point": 486, "electricity_consumed_peak_cumulative": 13966.608, "electricity_consumed_peak_interval": 0, "electricity_consumed_peak_point": 0, - "electricity_phase_one_consumed": 413, + "electricity_phase_one_consumed": 486, "electricity_phase_one_produced": 0, "electricity_produced_off_peak_cumulative": 0.0, "electricity_produced_off_peak_interval": 0, @@ -34,8 +34,8 @@ "electricity_produced_peak_cumulative": 0.0, "electricity_produced_peak_interval": 0, "electricity_produced_peak_point": 0, - "net_electricity_cumulative": 31610.113, - "net_electricity_point": 421 + "net_electricity_cumulative": 31610.031, + "net_electricity_point": 486 }, "vendor": "SHENZHEN KAIFA TECHNOLOGY \uff08CHENGDU\uff09 CO., LTD." } From 876f40c377d9838fcbb4e08463ebf7970985a17d Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 7 Jan 2024 10:21:15 +0100 Subject: [PATCH 075/306] Add one cooling_enabled switch for Elga in userdata --- userdata/anna_heatpump_heating/core.domain_objects.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/userdata/anna_heatpump_heating/core.domain_objects.xml b/userdata/anna_heatpump_heating/core.domain_objects.xml index d455dc482..85c4742b4 100644 --- a/userdata/anna_heatpump_heating/core.domain_objects.xml +++ b/userdata/anna_heatpump_heating/core.domain_objects.xml @@ -778,6 +778,12 @@ + + + 2022-11-02T03:57:23.207+01:00 + cooling_enabled + off + 2020-04-09T13:25:31.144+02:00 From 955c15f0564cab2db1492e056f7d09ff90197634 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 7 Jan 2024 10:24:36 +0100 Subject: [PATCH 076/306] Fix double code, add pragma-no-covers --- plugwise/helper.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugwise/helper.py b/plugwise/helper.py index c657cf49d..22e32a5fb 100644 --- a/plugwise/helper.py +++ b/plugwise/helper.py @@ -1178,8 +1178,8 @@ def _power_data_peak_value(self, loc: Munch) -> Munch: loc.found = False return loc else: - loc.found = False - return loc + loc.found = False # pragma: no cover + return loc # pragma: no cover if (peak := loc.peak_select.split("_")[1]) == "offpeak": peak = "off_peak" @@ -1236,7 +1236,8 @@ def _preset(self, loc_id: str) -> str | None: locator = f'./location[@id="{loc_id}"]/preset' if (preset := self._domain_objects.find(locator)) is not None: return str(preset.text) - return None + + return None # pragma: no cover def _schedules(self, location: str) -> tuple[list[str], str]: """Helper-function for smile.py: _device_data_climate(). @@ -1305,7 +1306,6 @@ def _object_value(self, obj_id: str, measurement: str) -> float | int | None: locator = f'./location[@id="{obj_id}"]/logs/point_log[type="{measurement}"]/period/measurement' if (found := search.find(locator)) is not None: val = format_measure(found.text, NONE) - return val return val From 6f774116fa397fb9f1786ce5f3d605d7770cd75c Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sun, 7 Jan 2024 12:52:27 +0100 Subject: [PATCH 077/306] Remove no longer needed xml-files --- .../adam_heatpump_cooling/core.appliances.xml | 2016 --------------- .../adam_heatpump_cooling/core.locations.xml | 896 ------- .../adam_heatpump_cooling/core.modules.xml | 893 ------- userdata/adam_jip/core.appliances.xml | 1349 ---------- userdata/adam_jip/core.direct_objects.xml | 1639 ------------ userdata/adam_jip/core.locations.xml | 293 --- userdata/adam_jip/core.modules.xml | 599 ----- .../core.appliances.xml | 1543 ------------ .../core.direct_objects.xml | 2014 --------------- .../core.locations.xml | 429 ---- .../core.modules.xml | 746 ------ .../core.appliances.xml | 599 ----- .../core.locations.xml | 896 ------- .../core.modules.xml | 893 ------- userdata/adam_plus_anna/core.appliances.xml | 570 ----- .../adam_plus_anna/core.direct_objects.xml | 763 ------ userdata/adam_plus_anna/core.locations.xml | 220 -- userdata/adam_plus_anna/core.modules.xml | 272 -- .../adam_plus_anna_new/core.appliances.xml | 953 ------- .../adam_plus_anna_new/core.locations.xml | 235 -- userdata/adam_plus_anna_new/core.modules.xml | 527 ---- .../adam_zone_per_device/core.appliances.xml | 1543 ------------ .../core.direct_objects.xml | 2215 ----------------- .../adam_zone_per_device/core.locations.xml | 630 ----- .../adam_zone_per_device/core.modules.xml | 746 ------ .../core.appliances.xml | 546 ---- .../anna_connected_to_adam/core.locations.xml | 111 - .../anna_connected_to_adam/core.modules.xml | 240 -- userdata/anna_elga_2/core.appliances.xml | 1333 ---------- userdata/anna_elga_2/core.locations.xml | 121 - userdata/anna_elga_2/core.modules.xml | 372 --- .../anna_elga_2_cooling/core.appliances.xml | 1350 ---------- .../anna_elga_2_cooling/core.locations.xml | 121 - userdata/anna_elga_2_cooling/core.modules.xml | 372 --- .../core.appliances.xml | 1333 ---------- .../core.locations.xml | 121 - .../anna_elga_2_schedule_off/core.modules.xml | 372 --- .../anna_elga_no_cooling/core.appliances.xml | 1294 ---------- .../core.direct_objects.xml | 1401 ----------- .../anna_elga_no_cooling/core.locations.xml | 137 - .../anna_elga_no_cooling/core.modules.xml | 387 --- .../.!16852!core.domain_objects.xml | 0 .../anna_heatpump_cooling/core.appliances.xml | 1278 ---------- .../core.direct_objects.xml | 1401 ----------- .../anna_heatpump_cooling/core.locations.xml | 137 - .../anna_heatpump_cooling/core.modules.xml | 387 --- .../core.appliances.xml | 1267 ---------- .../core.direct_objects.xml | 1401 ----------- .../core.locations.xml | 137 - .../core.modules.xml | 387 --- .../.!16852!core.domain_objects.xml | 0 .../core.appliances.xml | 1278 ---------- .../core.direct_objects.xml | 1401 ----------- .../core.locations.xml | 137 - .../core.modules.xml | 387 --- .../anna_heatpump_heating/core.appliances.xml | 1294 ---------- .../core.direct_objects.xml | 1401 ----------- .../anna_heatpump_heating/core.locations.xml | 137 - .../anna_heatpump_heating/core.modules.xml | 387 --- .../core.appliances.xml | 732 ------ .../core.locations.xml | 121 - .../core.modules.xml | 251 -- .../anna_loria_driessens/core.appliances.xml | 712 ------ .../anna_loria_driessens/core.locations.xml | 122 - .../anna_loria_driessens/core.modules.xml | 245 -- .../core.appliances.xml | 667 ----- .../core.locations.xml | 121 - .../anna_loria_heating_idle/core.modules.xml | 251 -- .../anna_v4/.!16969!core.domain_objects.xml | 0 userdata/anna_v4/core.appliances.xml | 569 ----- userdata/anna_v4/core.direct_objects.xml | 677 ----- userdata/anna_v4/core.locations.xml | 111 - userdata/anna_v4/core.modules.xml | 243 -- userdata/anna_v4_dhw/core.appliances.xml | 569 ----- userdata/anna_v4_dhw/core.direct_objects.xml | 677 ----- userdata/anna_v4_dhw/core.locations.xml | 111 - userdata/anna_v4_dhw/core.modules.xml | 243 -- .../core.appliances.xml | 362 --- .../core.direct_objects.xml | 481 ---- .../core.locations.xml | 122 - .../core.modules.xml | 168 -- .../.!17497!core.domain_objects.xml | 0 userdata/p1v4/.!18232!core.domain_objects.xml | 0 userdata/p1v4/core.appliances.xml | 72 - userdata/p1v4/core.direct_objects.xml | 158 -- userdata/p1v4/core.locations.xml | 91 - userdata/p1v4/core.modules.xml | 62 - userdata/p1v4_442_single/core.appliances.xml | 81 - userdata/p1v4_442_single/core.locations.xml | 111 - userdata/p1v4_442_single/core.modules.xml | 66 - userdata/p1v4_442_triple/core.appliances.xml | 81 - userdata/p1v4_442_triple/core.locations.xml | 210 -- userdata/p1v4_442_triple/core.modules.xml | 104 - .../adam_plus_anna_new/core.appliances.xml | 953 ------- .../adam_plus_anna_new/core.locations.xml | 235 -- .../adam_plus_anna_new/core.modules.xml | 527 ---- .../anna_heatpump_heating/core.appliances.xml | 1293 ---------- .../core.direct_objects.xml | 1401 ----------- .../anna_heatpump_heating/core.locations.xml | 137 - .../anna_heatpump_heating/core.modules.xml | 387 --- userdata/updated/anna_v4/core.appliances.xml | 569 ----- .../updated/anna_v4/core.direct_objects.xml | 677 ----- userdata/updated/anna_v4/core.locations.xml | 111 - userdata/updated/anna_v4/core.modules.xml | 243 -- .../p1v4_442_single/core.appliances.xml | 81 - .../p1v4_442_single/core.locations.xml | 111 - .../updated/p1v4_442_single/core.modules.xml | 66 - 107 files changed, 61289 deletions(-) delete mode 100644 userdata/adam_heatpump_cooling/core.appliances.xml delete mode 100644 userdata/adam_heatpump_cooling/core.locations.xml delete mode 100644 userdata/adam_heatpump_cooling/core.modules.xml delete mode 100644 userdata/adam_jip/core.appliances.xml delete mode 100644 userdata/adam_jip/core.direct_objects.xml delete mode 100644 userdata/adam_jip/core.locations.xml delete mode 100644 userdata/adam_jip/core.modules.xml delete mode 100644 userdata/adam_multiple_devices_per_zone/core.appliances.xml delete mode 100644 userdata/adam_multiple_devices_per_zone/core.direct_objects.xml delete mode 100644 userdata/adam_multiple_devices_per_zone/core.locations.xml delete mode 100644 userdata/adam_multiple_devices_per_zone/core.modules.xml delete mode 100644 userdata/adam_onoff_cooling_fake_firmware/core.appliances.xml delete mode 100644 userdata/adam_onoff_cooling_fake_firmware/core.locations.xml delete mode 100644 userdata/adam_onoff_cooling_fake_firmware/core.modules.xml delete mode 100644 userdata/adam_plus_anna/core.appliances.xml delete mode 100644 userdata/adam_plus_anna/core.direct_objects.xml delete mode 100644 userdata/adam_plus_anna/core.locations.xml delete mode 100644 userdata/adam_plus_anna/core.modules.xml delete mode 100644 userdata/adam_plus_anna_new/core.appliances.xml delete mode 100644 userdata/adam_plus_anna_new/core.locations.xml delete mode 100644 userdata/adam_plus_anna_new/core.modules.xml delete mode 100644 userdata/adam_zone_per_device/core.appliances.xml delete mode 100644 userdata/adam_zone_per_device/core.direct_objects.xml delete mode 100644 userdata/adam_zone_per_device/core.locations.xml delete mode 100644 userdata/adam_zone_per_device/core.modules.xml delete mode 100644 userdata/anna_connected_to_adam/core.appliances.xml delete mode 100644 userdata/anna_connected_to_adam/core.locations.xml delete mode 100644 userdata/anna_connected_to_adam/core.modules.xml delete mode 100644 userdata/anna_elga_2/core.appliances.xml delete mode 100644 userdata/anna_elga_2/core.locations.xml delete mode 100644 userdata/anna_elga_2/core.modules.xml delete mode 100644 userdata/anna_elga_2_cooling/core.appliances.xml delete mode 100644 userdata/anna_elga_2_cooling/core.locations.xml delete mode 100644 userdata/anna_elga_2_cooling/core.modules.xml delete mode 100644 userdata/anna_elga_2_schedule_off/core.appliances.xml delete mode 100644 userdata/anna_elga_2_schedule_off/core.locations.xml delete mode 100644 userdata/anna_elga_2_schedule_off/core.modules.xml delete mode 100644 userdata/anna_elga_no_cooling/core.appliances.xml delete mode 100644 userdata/anna_elga_no_cooling/core.direct_objects.xml delete mode 100644 userdata/anna_elga_no_cooling/core.locations.xml delete mode 100644 userdata/anna_elga_no_cooling/core.modules.xml delete mode 100644 userdata/anna_heatpump_cooling/.!16852!core.domain_objects.xml delete mode 100644 userdata/anna_heatpump_cooling/core.appliances.xml delete mode 100644 userdata/anna_heatpump_cooling/core.direct_objects.xml delete mode 100644 userdata/anna_heatpump_cooling/core.locations.xml delete mode 100644 userdata/anna_heatpump_cooling/core.modules.xml delete mode 100644 userdata/anna_heatpump_cooling_fake_firmware/core.appliances.xml delete mode 100644 userdata/anna_heatpump_cooling_fake_firmware/core.direct_objects.xml delete mode 100644 userdata/anna_heatpump_cooling_fake_firmware/core.locations.xml delete mode 100644 userdata/anna_heatpump_cooling_fake_firmware/core.modules.xml delete mode 100644 userdata/anna_heatpump_cooling_to_off/.!16852!core.domain_objects.xml delete mode 100644 userdata/anna_heatpump_cooling_to_off/core.appliances.xml delete mode 100644 userdata/anna_heatpump_cooling_to_off/core.direct_objects.xml delete mode 100644 userdata/anna_heatpump_cooling_to_off/core.locations.xml delete mode 100644 userdata/anna_heatpump_cooling_to_off/core.modules.xml delete mode 100644 userdata/anna_heatpump_heating/core.appliances.xml delete mode 100644 userdata/anna_heatpump_heating/core.direct_objects.xml delete mode 100644 userdata/anna_heatpump_heating/core.locations.xml delete mode 100644 userdata/anna_heatpump_heating/core.modules.xml delete mode 100644 userdata/anna_loria_cooling_active/core.appliances.xml delete mode 100644 userdata/anna_loria_cooling_active/core.locations.xml delete mode 100644 userdata/anna_loria_cooling_active/core.modules.xml delete mode 100644 userdata/anna_loria_driessens/core.appliances.xml delete mode 100644 userdata/anna_loria_driessens/core.locations.xml delete mode 100644 userdata/anna_loria_driessens/core.modules.xml delete mode 100644 userdata/anna_loria_heating_idle/core.appliances.xml delete mode 100644 userdata/anna_loria_heating_idle/core.locations.xml delete mode 100644 userdata/anna_loria_heating_idle/core.modules.xml delete mode 100644 userdata/anna_v4/.!16969!core.domain_objects.xml delete mode 100644 userdata/anna_v4/core.appliances.xml delete mode 100644 userdata/anna_v4/core.direct_objects.xml delete mode 100644 userdata/anna_v4/core.locations.xml delete mode 100644 userdata/anna_v4/core.modules.xml delete mode 100644 userdata/anna_v4_dhw/core.appliances.xml delete mode 100644 userdata/anna_v4_dhw/core.direct_objects.xml delete mode 100644 userdata/anna_v4_dhw/core.locations.xml delete mode 100644 userdata/anna_v4_dhw/core.modules.xml delete mode 100644 userdata/anna_without_boiler_fw441/core.appliances.xml delete mode 100644 userdata/anna_without_boiler_fw441/core.direct_objects.xml delete mode 100644 userdata/anna_without_boiler_fw441/core.locations.xml delete mode 100644 userdata/anna_without_boiler_fw441/core.modules.xml delete mode 100644 userdata/fail_firmware/.!17497!core.domain_objects.xml delete mode 100644 userdata/p1v4/.!18232!core.domain_objects.xml delete mode 100644 userdata/p1v4/core.appliances.xml delete mode 100644 userdata/p1v4/core.direct_objects.xml delete mode 100644 userdata/p1v4/core.locations.xml delete mode 100644 userdata/p1v4/core.modules.xml delete mode 100644 userdata/p1v4_442_single/core.appliances.xml delete mode 100644 userdata/p1v4_442_single/core.locations.xml delete mode 100644 userdata/p1v4_442_single/core.modules.xml delete mode 100644 userdata/p1v4_442_triple/core.appliances.xml delete mode 100644 userdata/p1v4_442_triple/core.locations.xml delete mode 100644 userdata/p1v4_442_triple/core.modules.xml delete mode 100644 userdata/updated/adam_plus_anna_new/core.appliances.xml delete mode 100644 userdata/updated/adam_plus_anna_new/core.locations.xml delete mode 100644 userdata/updated/adam_plus_anna_new/core.modules.xml delete mode 100644 userdata/updated/anna_heatpump_heating/core.appliances.xml delete mode 100644 userdata/updated/anna_heatpump_heating/core.direct_objects.xml delete mode 100644 userdata/updated/anna_heatpump_heating/core.locations.xml delete mode 100644 userdata/updated/anna_heatpump_heating/core.modules.xml delete mode 100644 userdata/updated/anna_v4/core.appliances.xml delete mode 100644 userdata/updated/anna_v4/core.direct_objects.xml delete mode 100644 userdata/updated/anna_v4/core.locations.xml delete mode 100644 userdata/updated/anna_v4/core.modules.xml delete mode 100644 userdata/updated/p1v4_442_single/core.appliances.xml delete mode 100644 userdata/updated/p1v4_442_single/core.locations.xml delete mode 100644 userdata/updated/p1v4_442_single/core.modules.xml diff --git a/userdata/adam_heatpump_cooling/core.appliances.xml b/userdata/adam_heatpump_cooling/core.appliances.xml deleted file mode 100644 index ffaf096df..000000000 --- a/userdata/adam_heatpump_cooling/core.appliances.xml +++ /dev/null @@ -1,2016 +0,0 @@ - - - - ZigBee InnrE - A device that communicates through the ZigBee protocol. - heater_electric - 2021-02-12T17:01:14.713+01:00 - 2021-12-02T21:48:35.292+01:00 - - - - - electricity_consumed - Wh - 2021-12-02T12:00:00+01:00 - 2021-12-02T11:45:00+01:00 - PT15M - - 0.00 - - - - electricity_produced - Wh - - - PT15M - - - relay - - 2021-12-02T12:00:51.301+01:00 - 2021-12-01T08:13:20.343+01:00 - - - off - - - - - - 2021-12-02T12:00:51.301+01:00 - false - - - - - Central heating boiler - - heater_central - 2020-10-26T19:31:21.629+01:00 - 2021-12-31T13:48:49.933+01:00 - - - - - boiler_fan_speed_setpoint - Hz - 2020-12-07T09:07:58.503+01:00 - 2020-12-07T09:07:58.503+01:00 - - - - 30.00 - - - - intended_boiler_temperature - C - 2021-12-31T13:36:00.350+01:00 - 2021-12-31T07:58:18.316+01:00 - - - - 0.00 - - - - boiler_temperature - C - 2021-12-31T13:48:49.906+01:00 - 2021-12-31T13:48:49.906+01:00 - PT1H - - - 24.47 - - - - burner_operation_time - s - 2021-12-31T13:00:00+01:00 - 2021-12-31T12:00:00+01:00 - PT1H - - - 0 - - - - open_therm_oem_diagnostic_code - - 2021-12-31T08:04:05.529+01:00 - 2021-12-31T08:04:05.528+01:00 - - - - 0 - - - - domestic_hot_water_burner_starts - - 2020-12-07T15:06:20+01:00 - 2020-12-07T15:06:20+01:00 - - - - 15096 - - - - flame_state - - 2021-12-31T11:48:12.890+01:00 - 2021-12-31T11:48:12.890+01:00 - - - - off - - - - failed_burner_starts - - 2020-12-07T15:06:20+01:00 - 2020-12-07T15:06:20+01:00 - - - - 53 - - - - domestic_hot_water_burner_operation_time - hr - 2020-12-07T15:06:20+01:00 - 2020-12-07T15:06:20+01:00 - - - - 789 - - - - central_heating_state - - 2021-12-31T08:01:11.974+01:00 - 2021-12-31T08:01:11.974+01:00 - - - - off - - - - domestic_hot_water_state - - 2021-12-31T08:02:17.065+01:00 - 2021-12-31T08:02:17.065+01:00 - - - - off - - - - open_therm_oem_fault_code - - 2021-12-31T06:17:30.042+01:00 - 2020-11-03T05:40:17.184+01:00 - - - - 255 - - - - central_heater_water_pressure - bar - 2021-12-31T12:54:07.312+01:00 - 2021-12-31T12:54:07.311+01:00 - - - - 2.00 - - - - flame_current - uA - 2020-12-07T09:08:28.131+01:00 - 2020-12-07T09:08:28.131+01:00 - - - - 7.80 - - - - modulation_level - - 2021-12-31T07:58:27.660+01:00 - 2021-12-31T07:58:27.659+01:00 - - - - 0.00 - - - - burner_operation_time - hr - 2021-12-31T05:50:39+01:00 - 2021-12-31T05:50:39+01:00 - - - - 8726 - - - - open_therm_application_specific_fault_code - - 2021-12-31T06:17:30.042+01:00 - 2020-12-07T17:07:09.637+01:00 - - - - 0 - - - - domestic_hot_water_pump_operation_time - hr - 2020-12-07T15:06:20+01:00 - 2020-12-07T15:06:20+01:00 - - - - 870 - - - - outdoor_temperature - C - 2021-12-31T13:48:46.816+01:00 - 2021-12-31T13:48:18.015+01:00 - PT3H - - - 13.50 - - - - failed_burner_flame_ignitions - - 2020-12-07T15:06:20+01:00 - 2020-12-07T15:06:20+01:00 - - - - 44 - - - - domestic_hot_water_setpoint - C - 2021-12-31T06:20:25.766+01:00 - 2021-04-07T08:30:23.187+02:00 - - - - 60.00 - - - - maximum_boiler_temperature - C - 2021-12-31T13:36:00.127+01:00 - 2021-12-09T13:55:16.719+01:00 - - - - 35.00 - - - - intended_central_heating_state - - 2021-12-31T07:58:16.177+01:00 - 2021-12-31T07:58:16.177+01:00 - - - - off - - - - burner_starts - - 2021-12-31T07:34:07+01:00 - 2021-12-31T07:34:07+01:00 - - - - 72636 - - - - central_heater_pump_operation_time - hr - 2021-12-31T07:51:33+01:00 - 2021-12-31T07:51:33+01:00 - - - - 12350 - - - - domestic_hot_water_comfort_mode - - 2021-04-07T08:30:11.542+02:00 - 2020-10-26T19:47:46.571+01:00 - - - - on - - - - domestic_hot_water_pump_starts - - 2021-12-30T16:06:02+01:00 - 2021-12-30T16:06:02+01:00 - - - - 441797 - - - - central_heater_pump_starts - - 2021-12-31T07:33:38+01:00 - 2021-12-31T07:33:38+01:00 - - - - 2490968 - - - - domestic_hot_water_temperature - C - 2020-12-07T09:08:32.446+01:00 - 2020-12-07T09:08:32.446+01:00 - PT1H - - - 63.50 - - - - cooling_state - - 2021-12-28T15:07:37.695+01:00 - 2021-12-28T15:07:37.695+01:00 - - - - off - - - - return_water_temperature - C - 2021-12-31T13:48:46.339+01:00 - 2021-12-31T13:48:46.339+01:00 - PT1H - - - 24.93 - - - - boiler_fan_speed - Hz - 2020-12-07T09:07:58.503+01:00 - 2020-12-07T09:07:58.503+01:00 - - - - 30.00 - - - - - - 2021-12-31T06:20:25.766+01:00 - domestic_hot_water_setpoint - 60 - 40 - 65 - 0.01 - - - - - 2021-12-31T13:36:00.127+01:00 - maximum_boiler_temperature - 35 - 7 - 50 - 0.01 - - - - - - 2021-04-07T08:30:11.542+02:00 - domestic_hot_water_comfort_mode - on - - - - - Thermostaat BK - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2020-10-28T14:59:20.005+01:00 - 2021-12-31T13:45:19.003+01:00 - - - - - - thermostat - C - 2021-12-31T08:00:03.239+01:00 - 2021-12-31T08:00:03.203+01:00 - - - - 18.00 - - - - temperature_offset - C - 2021-12-24T19:54:18.015+01:00 - 2020-11-08T09:57:03.288+01:00 - - - - 0.00 - - - - battery - - 2021-12-31T04:37:36.270+01:00 - 2021-12-30T16:44:07.154+01:00 - - - - 0.55 - - - - temperature - C - 2021-12-31T13:45:19.001+01:00 - 2021-12-31T13:45:19.001+01:00 - PT3H - - - 18.80 - - - - - - 2021-12-31T08:00:03.239+01:00 - thermostat - 18 - 0 - 99.9 - 0.01 - - - - - - 2021-12-24T19:54:18.015+01:00 - temperature_offset - 0 - - - - - Smart Plug RB - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-11-03T10:15:11.482+01:00 - 2021-12-31T13:41:14.111+01:00 - - - - - - electricity_produced - W - 2021-12-31T13:35:33.050+01:00 - 2020-11-03T10:15:17.904+01:00 - - - - 0.00 - - - - electricity_consumed - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.77 - - - - electricity_consumed - W - 2021-12-31T13:35:33.050+01:00 - 2021-12-29T07:30:55.567+01:00 - - - - 3.13 - - - - relay - - 2021-12-31T13:41:14.086+01:00 - 2021-12-22T09:30:16.696+01:00 - - - - off - - - - electricity_produced - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - - - 2021-12-31T13:41:14.086+01:00 - false - off - - - - - - Smart Plug BK1 - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-11-02T18:00:12.397+01:00 - 2021-12-31T13:46:58.916+01:00 - - - - - - electricity_consumed - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - relay - - 2021-12-31T13:46:58.905+01:00 - 2021-12-30T22:59:06.073+01:00 - - - - off - - - - electricity_consumed - W - 2021-12-31T13:32:34.226+01:00 - 2021-12-30T22:59:14.417+01:00 - - - - 0.00 - - - - electricity_produced - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - electricity_produced - W - 2021-12-31T13:32:34.226+01:00 - 2020-11-03T05:40:42.108+01:00 - - - - 0.00 - - - - - - 2021-12-31T13:46:58.905+01:00 - false - off - - - - - - Thermostaat BK2 - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2020-10-27T21:13:47.703+01:00 - 2021-12-31T13:43:08.362+01:00 - - - - - - temperature_offset - C - 2020-10-27T21:13:52.473+01:00 - 2020-10-27T21:13:52.209+01:00 - - - - 0.00 - - - - thermostat - C - 2021-12-31T01:57:38.409+01:00 - 2021-12-16T13:35:09.082+01:00 - - - - 20.50 - - - - temperature - C - 2021-12-31T13:43:08.360+01:00 - 2021-12-31T13:43:08.360+01:00 - PT3H - - - 21.90 - - - - - - 2021-12-31T01:57:38.409+01:00 - thermostat - 20.5 - 0 - 99.9 - 0.01 - - - - - - 2020-10-27T21:13:52.473+01:00 - temperature_offset - 0 - - - - - OpenThermGateway - An OpenTherm Gateway - open_therm_gateway - 2020-10-26T19:30:36.637+01:00 - 2020-10-26T19:37:47.912+01:00 - - - - - override_mode - - 2021-04-07T08:30:15.980+02:00 - 2020-10-26T19:30:36.855+01:00 - - - - on - - - - open_therm_power_mode - - 2021-04-07T08:30:16.294+02:00 - 2020-10-26T19:37:47.899+01:00 - - - - 0 - - - - - - - Smart Plug KK - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-10-30T10:24:39.251+01:00 - 2021-12-31T13:41:39.980+01:00 - - - - - - electricity_produced - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - electricity_consumed - W - 2021-12-31T13:29:46.944+01:00 - 2021-12-31T08:08:26.977+01:00 - - - - 2.13 - - - - electricity_produced - W - 2021-12-31T13:29:46.944+01:00 - 2020-10-30T16:13:18.696+01:00 - - - - 0.00 - - - - electricity_consumed - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - relay - - 2021-12-31T13:38:47.663+01:00 - 2021-12-31T07:48:16.655+01:00 - - - - on - - - - - - 2021-12-31T13:38:47.663+01:00 - false - on - - - - - - Smart Plug WK - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-11-02T16:16:28.852+01:00 - 2021-12-31T13:37:44.618+01:00 - - - - - - relay - - 2021-12-31T13:36:41.362+01:00 - 2021-12-31T07:48:16.675+01:00 - - - - off - - - - electricity_produced - W - 2021-12-31T13:36:58.429+01:00 - 2021-02-01T17:01:59.051+01:00 - - - - 0.00 - - - - electricity_produced - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - electricity_consumed - W - 2021-12-31T13:36:58.429+01:00 - 2021-12-31T07:48:33.204+01:00 - - - - 0.00 - - - - electricity_consumed - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - - - 2021-12-31T13:36:41.362+01:00 - false - off - - - - - - Thermostaat WK - A Thermostat - thermostat - 2020-10-26T19:47:45.303+01:00 - 2021-12-31T13:48:41.171+01:00 - - - - - - temperature - C - 2021-12-31T13:48:41.157+01:00 - 2021-12-31T13:48:41.157+01:00 - PT3H - - - 22.53 - - - - intended_central_heating_state - - 2021-12-31T13:46:12.032+01:00 - 2021-12-26T09:56:16.978+01:00 - - - - off - - - - thermostat - C - 2021-12-31T13:48:37.094+01:00 - 2021-12-16T17:15:00.702+01:00 - - - - 21.50 - - - - maximum_modulation_level - - 2020-10-26T19:51:11.197+01:00 - 2020-10-26T19:47:49.466+01:00 - - - - 1.00 - - - - intended_domestic_hot_water_comfort_mode - - 2021-12-31T13:46:12.032+01:00 - 2020-10-26T19:47:45.591+01:00 - - - - on - - - - - - 2021-12-31T13:48:37.094+01:00 - thermostat - 21.5 - 1 - 35 - 0.01 - - - - - - - Smart Plug BK - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-11-02T16:53:27.781+01:00 - 2021-12-31T13:48:34.921+01:00 - - - - - - relay - - 2021-12-31T13:37:43.493+01:00 - 2021-12-31T01:45:24.928+01:00 - - - - off - - - - electricity_produced - Wh - 2021-12-31T13:45:00+01:00 - 2021-12-31T13:30:00+01:00 - PT15M - - - 0.00 - - - - electricity_consumed - W - 2021-12-31T13:37:55.350+01:00 - 2021-12-31T01:45:36.455+01:00 - - - - 0.00 - - - - electricity_consumed - Wh - 2021-12-31T13:45:00+01:00 - 2021-12-31T13:30:00+01:00 - PT15M - - - 0.00 - - - - electricity_produced - W - 2021-12-31T13:37:55.350+01:00 - 2020-11-02T16:53:32.263+01:00 - - - - 0.00 - - - - - - 2021-12-31T13:37:43.493+01:00 - false - off - - - - - - Thermostaat RB - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2020-10-28T15:07:25.005+01:00 - 2021-12-31T13:48:46.497+01:00 - - - - - - thermostat - C - 2021-12-31T03:48:02.736+01:00 - 2021-12-29T15:47:23.817+01:00 - - - - 17.00 - - - - temperature - C - 2021-12-31T13:48:46.492+01:00 - 2021-12-31T13:48:46.492+01:00 - PT3H - - - 20.70 - - - - temperature_offset - C - 2020-10-28T15:07:33.735+01:00 - 2020-10-28T15:07:33.280+01:00 - - - - 0.00 - - - - - - - 2020-10-28T15:07:33.735+01:00 - temperature_offset - 0 - - - 2021-12-31T03:48:02.736+01:00 - thermostat - 17 - 0 - 99.9 - 0.01 - - - - - - - Thermostaat BK1 - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2020-10-27T21:07:24.125+01:00 - 2021-12-31T13:38:34.576+01:00 - - - - - - thermostat - C - 2021-12-31T05:26:35.148+01:00 - 2021-12-23T17:15:00.709+01:00 - - - - 20.50 - - - - temperature_offset - C - 2020-10-27T21:07:28.892+01:00 - 2020-10-27T21:07:28.676+01:00 - - - - 0.00 - - - - temperature - C - 2021-12-31T13:38:34.574+01:00 - 2021-12-31T13:38:34.574+01:00 - PT3H - - - 21.50 - - - - - - - 2020-10-27T21:07:28.892+01:00 - temperature_offset - 0 - - - 2021-12-31T05:26:35.148+01:00 - thermostat - 20.5 - 0 - 99.9 - 0.01 - - - - - - - Thermostaat SQ - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2020-10-27T21:08:54.651+01:00 - 2021-12-31T13:46:54.988+01:00 - - - - - - temperature - C - 2021-12-31T13:46:54.985+01:00 - 2021-12-31T13:46:54.985+01:00 - PT3H - - - 21.40 - - - - thermostat - C - 2021-12-31T01:55:13.767+01:00 - 2021-12-16T13:35:09.039+01:00 - - - - 18.50 - - - - temperature_offset - C - 2020-10-27T21:08:59.077+01:00 - 2020-10-27T21:08:58.784+01:00 - - - - 0.00 - - - - - - - 2020-10-27T21:08:59.077+01:00 - temperature_offset - 0 - - - 2021-12-31T01:55:13.767+01:00 - thermostat - 18.5 - 0 - 99.9 - 0.01 - - - - - - - Smart Plug JM - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-11-02T21:24:39.151+01:00 - 2021-12-31T13:39:38.249+01:00 - - - - - - electricity_consumed - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - relay - - 2021-12-31T13:39:38.246+01:00 - 2021-12-23T13:10:21.147+01:00 - - - - off - - - - electricity_produced - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - electricity_consumed - W - 2021-12-31T13:25:16.545+01:00 - 2021-12-23T13:10:33.630+01:00 - - - - 0.00 - - - - electricity_produced - W - 2021-12-31T13:25:16.545+01:00 - 2020-11-03T05:40:37.085+01:00 - - - - 0.00 - - - - - - 2021-12-31T13:39:38.246+01:00 - false - off - - - - - - Smart Plug SJ - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-11-03T11:13:01.015+01:00 - 2021-12-31T13:46:26.498+01:00 - - - - - - electricity_consumed - W - 2021-12-31T13:46:26.306+01:00 - 2020-11-03T11:13:07.884+01:00 - - - - 0.00 - - - - relay - - 2021-12-31T13:42:29.874+01:00 - 2021-12-24T08:10:18.755+01:00 - - - - off - - - - electricity_consumed - Wh - 2021-12-31T13:45:00+01:00 - 2021-12-31T13:30:00+01:00 - PT15M - - - 0.00 - - - - electricity_produced - W - 2021-12-31T13:46:26.306+01:00 - 2020-11-03T11:13:07.884+01:00 - - - - 0.00 - - - - electricity_produced - Wh - 2021-12-31T13:45:00+01:00 - 2021-12-31T13:30:00+01:00 - PT15M - - - 0.00 - - - - - - 2021-12-31T13:42:29.874+01:00 - false - off - - - - - - Gateway - Container for variables logged about the Gateway in general. - gateway - 2020-10-26T19:29:29.541+01:00 - 2021-12-24T15:23:49.836+01:00 - - - - - gateway_mode - - - - - - - - regulation_mode - - 2021-12-16T13:35:09.030+01:00 - 2020-10-26T19:29:29.969+01:00 - - - - cooling - - - - wlan_state - - 2021-12-24T15:23:49.624+01:00 - 2021-12-22T09:16:42.163+01:00 - - - - down - - - - lan_ip_address - - 2021-12-24T15:23:49+01:00 - 2021-12-24T15:23:49+01:00 - - - - 127.0.0.2 - - - - signal_strength - dBm - 2021-12-22T09:16:32.569+01:00 - 2021-12-22T09:16:32.569+01:00 - - - - -48.00 - - - - wlan_ip_address - - 2021-12-24T15:23:49.624+01:00 - 2021-12-22T09:16:42+01:00 - - - - 0.0.0.0 - - - - lan_state - - 2021-12-24T15:23:49.788+01:00 - 2021-12-24T15:17:21.680+01:00 - - - - up - - - - link_quality - - 2021-12-22T09:16:32.569+01:00 - 2021-12-22T09:16:32.569+01:00 - - - - 62 - - - - - - - - gateway_mode - full - - setup - light - away - vacation - - full - secure - - - - - 2021-12-16T13:35:09.030+01:00 - regulation_mode - cooling - - heating - off - bleeding_cold - bleeding_hot - cooling - - - - - - Smart Plug SQ - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-10-26T19:54:10.743+01:00 - 2021-12-31T13:37:34.007+01:00 - - - - - - electricity_consumed - W - 2021-12-31T13:23:10.582+01:00 - 2021-12-22T14:35:59.086+01:00 - - - - 0.00 - - - - electricity_produced - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - relay - - 2021-12-31T13:37:34.002+01:00 - 2021-12-22T14:35:49.869+01:00 - - - - off - - - - electricity_produced - W - 2021-12-31T13:23:10.582+01:00 - 2020-10-26T19:54:12.834+01:00 - - - - 0.00 - - - - electricity_consumed - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - - - 2021-12-31T13:37:34.002+01:00 - false - off - - - - - - Smart Plug DB - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-11-03T10:12:24.094+01:00 - 2021-12-31T13:36:32.111+01:00 - - - - - - electricity_produced - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - electricity_produced - W - 2021-12-31T13:22:13.396+01:00 - 2020-11-03T10:12:30.451+01:00 - - - - 0.00 - - - - electricity_consumed - W - 2021-12-31T13:22:13.396+01:00 - 2021-12-26T01:00:36.730+01:00 - - - - 0.00 - - - - electricity_consumed - Wh - 2021-12-31T13:30:00+01:00 - 2021-12-31T13:15:00+01:00 - PT15M - - - 0.00 - - - - relay - - 2021-12-31T13:36:32.108+01:00 - 2021-12-26T01:00:21.033+01:00 - - - - off - - - - - - 2021-12-31T13:36:32.108+01:00 - false - off - - - - - - Smart Plug BK2 - A smart plug that can be switched on/off and measure power usage. - valve_actuator - 2020-11-02T18:04:00.035+01:00 - 2021-12-31T13:48:02.942+01:00 - - - - - - electricity_produced - Wh - 2021-12-31T13:45:00+01:00 - 2021-12-31T13:30:00+01:00 - PT15M - - - 0.00 - - - - relay - - 2021-12-31T13:48:02.940+01:00 - 2021-12-26T04:30:22.278+01:00 - - - - off - - - - electricity_produced - W - 2021-12-31T13:33:43.042+01:00 - 2020-11-02T18:04:06.479+01:00 - - - - 0.00 - - - - electricity_consumed - Wh - 2021-12-31T13:45:00+01:00 - 2021-12-31T13:30:00+01:00 - PT15M - - - 0.00 - - - - electricity_consumed - W - 2021-12-31T13:33:43.042+01:00 - 2021-12-26T04:30:35.520+01:00 - - - - 0.00 - - - - - - 2021-12-31T13:48:02.940+01:00 - false - off - - - - - - Thermostaat KK - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2020-10-27T09:22:32.346+01:00 - 2021-12-31T13:48:14.157+01:00 - - - - - - temperature_offset - C - 2021-12-25T07:30:46.661+01:00 - 2021-02-17T12:31:50.397+01:00 - - - - 0.00 - - - - temperature - C - 2021-12-31T13:48:14.155+01:00 - 2021-12-31T13:48:14.155+01:00 - PT3H - - - 22.50 - - - - thermostat - C - 2021-12-31T03:04:32.792+01:00 - 2021-12-20T13:34:07.924+01:00 - - - - 21.50 - - - - battery - - 2021-12-31T06:58:15.453+01:00 - 2021-12-27T18:24:04.650+01:00 - - - - 0.53 - - - - - - - 2021-12-25T07:30:46.661+01:00 - temperature_offset - 0 - - - 2021-12-31T03:04:32.792+01:00 - thermostat - 21.5 - 0 - 99.9 - 0.01 - - - - - - - Thermostaat SJ - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2020-10-26T20:25:18.277+01:00 - 2021-12-31T13:48:17.701+01:00 - - - - - - temperature_offset - C - 2020-10-26T20:25:21.413+01:00 - 2020-10-26T20:25:21.198+01:00 - - - - 0.00 - - - - temperature - C - 2021-12-31T13:48:17.698+01:00 - 2021-12-31T13:48:17.698+01:00 - PT3H - - - 22.60 - - - - thermostat - C - 2021-12-31T12:08:28.156+01:00 - 2021-12-21T11:53:40.255+01:00 - - - - 20.50 - - - - - - 2021-12-31T12:08:28.156+01:00 - thermostat - 20.5 - 0 - 99.9 - 0.01 - - - - - - 2020-10-26T20:25:21.413+01:00 - temperature_offset - 0 - - - - - Thermostaat DB - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2020-10-28T15:14:08.541+01:00 - 2021-12-31T13:35:34.784+01:00 - - - - - - temperature - C - 2021-12-31T13:35:34.781+01:00 - 2021-12-31T13:35:34.781+01:00 - PT3H - - - 22.00 - - - - thermostat - C - 2021-12-31T03:21:00.142+01:00 - 2021-12-22T09:29:44.600+01:00 - - - - 18.00 - - - - temperature_offset - C - 2020-10-28T15:14:14.167+01:00 - 2020-10-28T15:14:13.847+01:00 - - - - 0.00 - - - - - - - 2020-10-28T15:14:14.167+01:00 - temperature_offset - 0 - - - 2021-12-31T03:21:00.142+01:00 - thermostat - 18 - 0 - 99.9 - 0.01 - - - - - - - Thermostaat JM - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2020-10-28T16:02:36.260+01:00 - 2021-12-31T13:42:47.867+01:00 - - - - - - temperature_offset - C - 2020-10-28T16:02:42.372+01:00 - 2020-10-28T16:02:42.073+01:00 - - - - 0.00 - - - - thermostat - C - 2021-12-31T01:56:24.596+01:00 - 2021-12-16T13:34:45.084+01:00 - - - - 18.00 - - - - temperature - C - 2021-12-31T13:42:47.865+01:00 - 2021-12-31T13:42:47.865+01:00 - PT3H - - - 20.00 - - - - - - 2021-12-31T01:56:24.596+01:00 - thermostat - 18 - 0 - 99.9 - 0.01 - - - - - - 2020-10-28T16:02:42.372+01:00 - temperature_offset - 0 - - - - diff --git a/userdata/adam_heatpump_cooling/core.locations.xml b/userdata/adam_heatpump_cooling/core.locations.xml deleted file mode 100644 index 901f252fc..000000000 --- a/userdata/adam_heatpump_cooling/core.locations.xml +++ /dev/null @@ -1,896 +0,0 @@ - - - - Home - - building - 2020-10-26T19:29:30.429+01:00 - 2021-12-31T13:47:22.212+01:00 - - home - - - - - humidity - RH - 2021-12-31T13:47:21+01:00 - 2021-12-31T13:47:21+01:00 - PT3H - - - 88.00 - - - - weather_description - - 2021-12-31T13:47:21+01:00 - 2021-12-31T13:47:21+01:00 - - - - clouded - - - - wind_vector - m_s - 2021-12-31T13:47:21+01:00 - 2021-12-31T13:47:21+01:00 - - - - (1.79,228.00) - - - - solar_irradiance - W_m2 - 2021-12-31T13:47:21+01:00 - 2021-12-31T13:47:21+01:00 - - - - 208.25 - - - - outdoor_temperature - C - 2021-12-31T13:47:21+01:00 - 2021-12-31T13:47:21+01:00 - PT3H - - - 13.38 - - - - - - - Slaapkamer JM - - bedroom - 2020-10-26T20:14:43.532+01:00 - 2021-12-31T13:42:47.876+01:00 - - away - - - - - - - - electricity_produced - W - 2020-11-03T05:40:37.085+01:00 - 2020-11-02T21:25:17.648+01:00 - - - 0.00 - - - - thermostat - C - 2021-12-16T13:35:08.807+01:00 - 2021-04-07T08:00:01.259+02:00 - - - 18.00 - - - - temperature - C - 2021-12-31T13:42:47.865+01:00 - 2021-04-07T07:56:10.530+02:00 - PT3H - - 20.00 - - - - electricity_consumed - W - 2021-12-23T13:10:33.630+01:00 - 2021-04-06T12:46:16.748+02:00 - - - 0.00 - - - - relay - - - - - - - - - 2021-12-16T13:35:08.808+01:00 - thermostat - 18 - 0 - 99.9 - 0.01 - - false - false - off - passive - - - - false - single - - - - - Keuken - - kitchen - 2020-11-08T10:12:21.729+01:00 - 2021-12-31T13:48:14.175+01:00 - - away - - - - - - - - relay - - - - - - - thermostat - C - 2021-12-31T08:00:00.595+01:00 - 2021-04-07T08:00:02.103+02:00 - - - 21.50 - - - - temperature - C - 2021-12-31T13:48:14.155+01:00 - 2021-04-07T07:59:38.185+02:00 - PT3H - - 22.50 - - - - electricity_consumed - W - 2021-12-31T08:08:26.977+01:00 - 2021-04-05T22:57:41.866+02:00 - - - 2.13 - - - - electricity_produced - W - 2020-11-08T10:16:20.020+01:00 - - - - 0.00 - - - - - - - false - single - - - 2021-12-31T08:00:00.596+01:00 - thermostat - 21.5 - 0 - 99.9 - 0.01 - - true - true - off - active - - - - - Badkamer 1 - - bathroom - 2020-10-26T20:15:57.585+01:00 - 2021-12-31T13:38:34.585+01:00 - - away - - - - - - - - temperature - C - 2021-12-31T13:38:34.574+01:00 - 2021-04-07T08:02:51.689+02:00 - PT3H - - 21.50 - - - - thermostat - C - 2021-12-31T08:00:00.345+01:00 - 2021-04-07T08:00:03.538+02:00 - - - 20.50 - - - - electricity_produced - W - 2021-12-02T12:02:34.539+01:00 - 2020-11-03T05:40:42.108+01:00 - - - 0.00 - - - - electricity_consumed - W - 2021-12-30T22:59:14.417+01:00 - 2021-04-07T03:18:21.274+02:00 - - - 0.00 - - - - relay - - - - - - - - - - false - single - - - 2021-12-31T08:00:00.346+01:00 - thermostat - 20.5 - 0 - 99.9 - 0.01 - - false - false - off - passive - - - - - Slaapkamer DB - - bedroom - 2020-10-26T20:15:41.745+01:00 - 2021-12-31T13:35:34.796+01:00 - - away - - - - - - - - relay - - - - - - - thermostat - C - 2021-12-22T09:29:44.600+01:00 - 2021-04-07T08:00:03.398+02:00 - - - 18.00 - - - - electricity_produced - W - 2020-11-03T10:13:40.211+01:00 - - - - 0.00 - - - - temperature - C - 2021-12-31T13:35:34.781+01:00 - 2021-04-07T08:04:20.846+02:00 - PT3H - - 22.00 - - - - electricity_consumed - W - 2021-12-26T01:00:36.730+01:00 - 2021-04-02T16:13:17.008+02:00 - - - 0.00 - - - - - - - false - single - - - 2021-12-22T09:29:43.730+01:00 - thermostat - 18 - 0 - 99.9 - 0.01 - - false - false - off - passive - - - - - Woonkamer - - livingroom - 2020-10-26T19:48:17.829+01:00 - 2021-12-31T13:48:41.183+01:00 - - away - - - - - - - - electricity_produced - W - 2021-02-01T17:01:59.051+01:00 - 2020-11-03T05:45:03.181+01:00 - - - 0.00 - - - - temperature - C - 2021-12-31T13:48:41.157+01:00 - 2021-04-07T08:04:32.514+02:00 - PT3H - - 22.53 - - - - thermostat - C - 2021-12-31T08:00:00.699+01:00 - 2021-04-07T08:00:02.245+02:00 - - - 21.50 - - - - relay - - - - - - - electricity_consumed - W - 2021-12-31T07:48:33.204+01:00 - 2021-04-07T06:34:36.303+02:00 - - - 0.00 - - - - - - - false - single - - - 2021-12-31T08:00:00.700+01:00 - thermostat - 21.5 - 1 - 35 - 0.01 - - true - true - off - active - - - - - Badkamer 2 - - bathroom - 2020-10-26T20:16:28.909+01:00 - 2021-12-31T13:43:08.374+01:00 - - away - - - - - - - - relay - - - - - - - electricity_consumed - W - 2021-12-26T04:30:35.520+01:00 - 2021-04-07T08:03:54.353+02:00 - - - 0.00 - - - - temperature - C - 2021-12-31T13:43:08.360+01:00 - 2021-04-07T08:04:14.217+02:00 - PT3H - - 21.90 - - - - electricity_produced - W - - - - - - thermostat - C - 2021-12-31T08:00:00.418+01:00 - 2021-04-07T08:00:03.489+02:00 - - - 20.50 - - - - - - 2021-12-31T08:00:00.419+01:00 - thermostat - 20.5 - 0 - 99.9 - 0.01 - - false - false - off - passive - - - - false - single - - - - - Slaapkamer SJ - - bedroom - 2020-10-26T20:15:17.817+01:00 - 2021-12-31T13:48:17.710+01:00 - - away - - - - - - - - electricity_consumed - W - 2020-11-03T11:16:01.498+01:00 - - - - 0.00 - - - - thermostat - C - 2021-12-21T11:53:40.255+01:00 - 2021-04-07T08:00:02.558+02:00 - - - 20.50 - - - - temperature - C - 2021-12-31T13:48:17.698+01:00 - 2021-04-07T07:59:51.332+02:00 - PT3H - - 22.60 - - - - relay - - - - - - - electricity_produced - W - 2020-11-03T11:16:01.498+01:00 - - - - 0.00 - - - - - - 2021-12-21T11:53:40.256+01:00 - thermostat - 20.5 - 0 - 99.9 - 0.01 - - true - false - off - passive - - - - false - single - - - - - Bijkeuken - - pantry - 2020-10-26T20:14:10.673+01:00 - 2021-12-31T13:45:19.012+01:00 - - away - - - - - - - - thermostat - C - 2021-12-31T08:00:03.203+01:00 - 2021-04-07T08:00:01.969+02:00 - - - 18.00 - - - - electricity_produced - W - 2020-11-08T10:16:47.978+01:00 - 2020-11-02T16:54:02.973+01:00 - - - 0.00 - - - - temperature - C - 2021-12-31T13:45:19.001+01:00 - 2021-04-07T07:53:07.828+02:00 - PT3H - - 18.80 - - - - relay - - - - - - - electricity_consumed - W - 2021-12-31T01:45:36.455+01:00 - 2021-04-07T07:16:14.472+02:00 - - - 0.00 - - - - - - - false - single - - - 2021-12-31T08:00:00.492+01:00 - thermostat - 18 - 0 - 99.9 - 0.01 - - false - false - off - active - - - - - Slaapkamer RB - - bedroom - 2020-10-26T20:15:30.226+01:00 - 2021-12-31T13:48:46.508+01:00 - - away - - - - - - - - electricity_consumed - W - 2021-12-29T07:30:55.567+01:00 - 2021-04-07T03:30:32.301+02:00 - - - 3.13 - - - - electricity_produced - W - - - - - - thermostat - C - 2021-12-29T15:47:23.817+01:00 - 2021-04-07T08:00:03.357+02:00 - - - 17.00 - - - - temperature - C - 2021-12-31T13:48:46.492+01:00 - 2021-04-07T08:04:29.201+02:00 - PT3H - - 20.70 - - - - relay - - - - - - - - - 2021-12-29T15:47:23.818+01:00 - thermostat - 17 - 0 - 99.9 - 0.01 - - false - false - off - passive - - - - false - single - - - - - Slaapkamer SQ - - bedroom - 2020-10-26T20:15:02.704+01:00 - 2021-12-31T13:46:55.002+01:00 - - away - - - - - - - - electricity_consumed - W - 2021-12-22T14:35:59.086+01:00 - 2021-04-07T08:04:48.453+02:00 - - - 0.00 - - - - electricity_produced - W - 2020-11-05T21:01:11.868+01:00 - - - - 0.00 - - - - thermostat - C - 2021-12-16T13:35:09.039+01:00 - 2021-04-07T08:00:03.445+02:00 - - - 18.50 - - - - temperature - C - 2021-12-31T13:46:54.985+01:00 - 2021-04-07T08:04:16.421+02:00 - PT3H - - 21.40 - - - - relay - - - - - - - - - - false - single - - - 2021-12-16T13:35:08.758+01:00 - thermostat - 18.5 - 0 - 99.9 - 0.01 - - true - false - off - passive - - - - diff --git a/userdata/adam_heatpump_cooling/core.modules.xml b/userdata/adam_heatpump_cooling/core.modules.xml deleted file mode 100644 index 9b6974206..000000000 --- a/userdata/adam_heatpump_cooling/core.modules.xml +++ /dev/null @@ -1,893 +0,0 @@ - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-11-03T10:12:22.640+01:00 - 2020-11-04T17:54:14.562+01:00 - - - - - - - - - - - - - - - ABCD012345670A05 - router - true - mains - - - - - - - Plugwise B.V. - 143.1 - - - 2020-10-26T19:42:17.506+01:00 - 2020-10-26T19:47:55.300+01:00 - - - - - - - - - - - - - - - - - - - - - 0.0 - - - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-10-30T10:24:38.959+01:00 - 2020-11-04T17:54:16.061+01:00 - - - - - - - - - - - - - - - ABCD012345670A06 - router - true - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2020-10-27T21:08:54.309+01:00 - 2020-10-27T21:08:57.114+01:00 - - - - - - - - - - - - - - - ABCD012345670A07 - router - true - mains - - - - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-11-02T21:24:38.806+01:00 - 2020-11-04T17:54:20.819+01:00 - - - - - - - - - - - - - - - ABCD012345670A03 - router - true - mains - - - - - - - Telegesis - ETRX3USB - - - 2020-10-26T19:30:33.244+01:00 - 2020-10-26T19:30:33.298+01:00 - - - - - ABCD012345670101 - false - - - - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-10-26T19:54:10.481+01:00 - 2020-11-04T17:54:18.271+01:00 - - - - - - - - - - - - - - - ABCD012345670A15 - router - true - mains - - - - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-11-02T16:53:27.426+01:00 - 2020-11-04T17:54:38.379+01:00 - - - - - - - - - - - - - - - ABCD012345670A12 - router - true - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2020-10-26T20:25:18.007+01:00 - 2020-10-26T20:25:19.835+01:00 - - - - - - - - - - - - - - - ABCD012345670A13 - router - true - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2020-10-27T09:22:31.306+01:00 - 2020-11-08T10:01:36.293+01:00 - - - - - - - - - - - - - - - - - - ABCD012345670A02 - end_device - true - battery - - - - - - - Plugwise - Gateway - AME Smile 2.0 board - - 2020-10-26T19:29:29.199+01:00 - 2021-01-20T00:28:25.582+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - Adam - 6539-1601-4502 - 2018-10-30T10:12:41+01:00 - 2020-10-26T19:30:24.505+01:00 - 2020-10-26T19:42:55.561+01:00 - - - - - - - - - - - - 16-50-001-994 - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2020-10-28T16:02:35.892+01:00 - 2020-10-28T16:02:39.917+01:00 - - - - - - - - - - - - - - - ABCD012345670A01 - router - true - mains - - - - - - - - - - - 2020-10-26T19:29:30.127+01:00 - 2020-10-26T19:29:30.409+01:00 - - - - - - - - - - - - - - - - - - - - - - - - Remeha B.V. - 17.1 - - - 2020-10-26T19:31:21.474+01:00 - 2020-12-07T15:06:20.208+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3.0 - true - 45 - 0 - false - false - false - true - false - true - true - smart_grid_off - off - - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-11-03T11:13:00.448+01:00 - 2020-11-04T19:32:56.934+01:00 - - - - - - - - - - - - - - - ABCD012345670A14 - router - true - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2020-10-27T21:13:47.398+01:00 - 2020-10-27T21:13:50.761+01:00 - - - - - - - - - - - - - - - ABCD012345670A11 - router - true - mains - - - - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-11-02T18:00:12.071+01:00 - 2020-11-04T17:54:20.811+01:00 - - - - - - - - - - - - - - - ABCD012345670A16 - router - true - mains - - - - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-11-02T18:03:59.318+01:00 - 2020-11-04T17:54:18.301+01:00 - - - - - - - - - - - - - - - ABCD012345670A10 - router - true - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2020-10-27T21:07:23.796+01:00 - 2020-10-27T21:07:27.164+01:00 - - - - - - - - - - - - - - - ABCD012345670A09 - router - true - mains - - - - - - - Plugwise - 106-03 - 1 - 2019-03-27T01:00:00+01:00 - - 2020-10-27T09:34:30.962+01:00 - 2020-11-02T21:13:43.476+01:00 - - - - - - - - - - - - ABCD012345670A19 - router - false - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2020-10-28T15:07:24.695+01:00 - 2020-10-28T15:07:28.188+01:00 - - - - - - - - - - - - - - - ABCD012345670A04 - router - true - mains - - - - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-11-03T10:15:11.011+01:00 - 2020-11-04T17:54:18.451+01:00 - - - - - - - - - - - - - - - ABCD012345670A08 - router - true - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2020-10-28T14:59:18.964+01:00 - 2020-10-28T15:00:58.085+01:00 - - - - - - - - - - - - - - - - - - ABCD012345670A17 - end_device - true - battery - - - - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-11-02T16:16:28.466+01:00 - 2020-11-04T17:54:14.686+01:00 - - - - - - - - - - - - - - - ABCD012345670A18 - router - true - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2020-10-28T15:14:08.208+01:00 - 2020-10-28T15:14:11.924+01:00 - - - - - - - - - - - - - - - ABCD012345670A20 - router - true - mains - - - - - - diff --git a/userdata/adam_jip/core.appliances.xml b/userdata/adam_jip/core.appliances.xml deleted file mode 100644 index df662d4c3..000000000 --- a/userdata/adam_jip/core.appliances.xml +++ /dev/null @@ -1,1349 +0,0 @@ - - - - Toon - A Thermostat - thermostat - 2020-11-24T13:22:01.670+01:00 - 2021-06-17T17:32:43.329+02:00 - - - - - intended_central_heating_state - - 2021-06-17T17:30:48.582+02:00 - 2021-06-04T15:47:05.188+02:00 - - - - off - - - - thermostat - C - 2021-06-17T17:32:43.316+02:00 - 2021-06-17T09:56:30.525+02:00 - - - - 9.00 - - - - temperature - C - 2021-06-17T17:31:30.851+02:00 - 2021-06-17T17:31:30.851+02:00 - PT3H - - - 27.71 - - - - maximum_modulation_level - - 2021-01-15T20:17:15.160+01:00 - 2021-01-15T17:27:03.869+01:00 - - - - 1.00 - - - - intended_domestic_hot_water_comfort_mode - - 2021-06-17T17:30:48.582+02:00 - 2021-06-17T06:31:23.701+02:00 - - - - on - - - - - - 2021-06-17T17:32:43.316+02:00 - thermostat - 9 - 1 - 35 - 0.01 - - - - - - - Central heating boiler - - heater_central - 2019-01-30T19:15:31.166+01:00 - 2021-06-17T17:32:49.622+02:00 - - - - - central_heating_state - - 2021-06-07T07:11:43.018+02:00 - 2021-06-07T07:11:43.018+02:00 - - - - off - - - - domestic_hot_water_pump_operation_time - hr - 2021-06-17T16:38:44+02:00 - 2021-06-17T16:38:44+02:00 - - - - 23842 - - - - domestic_hot_water_setpoint - C - 2021-01-15T15:05:43.778+01:00 - 2020-11-24T13:21:48.127+01:00 - - - - 60.00 - - - - open_therm_oem_fault_code - - 2021-06-17T13:38:20.199+02:00 - 2020-11-24T13:21:50.656+01:00 - - - - 255 - - - - domestic_hot_water_comfort_mode - - 2021-06-04T15:37:30.430+02:00 - 2021-02-19T23:30:36.819+01:00 - - - - off - - - - flame_state - - 2021-06-17T12:49:02.945+02:00 - 2021-06-17T12:49:02.945+02:00 - - - - off - - - - boiler_fan_speed_setpoint - Hz - 2021-06-17T12:49:43.784+02:00 - 2021-06-17T12:49:43.783+02:00 - - - - 0.00 - - - - central_heater_water_pressure - bar - 2021-06-17T14:58:01.736+02:00 - 2021-06-17T14:58:01.735+02:00 - - - - 1.40 - - - - burner_operation_time - s - 2021-06-17T17:00:00+02:00 - 2021-06-17T16:00:00+02:00 - PT1H - - - 0 - - - - failed_burner_flame_ignitions - - 2021-01-15T19:04:55+01:00 - 2021-01-15T19:04:55+01:00 - - - - 0 - - - - domestic_hot_water_state - - 2021-06-17T12:49:02.937+02:00 - 2021-06-17T12:49:02.937+02:00 - - - - off - - - - burner_starts - - 2021-06-17T12:42:24+02:00 - 2021-06-17T12:42:24+02:00 - - - - 15344 - - - - domestic_hot_water_pump_starts - - 2021-06-17T08:14:27+02:00 - 2021-06-17T08:14:27+02:00 - - - - 650375 - - - - boiler_fan_speed - Hz - 2021-06-17T12:49:43.784+02:00 - 2021-06-17T12:49:43.783+02:00 - - - - 0.00 - - - - cooling_state - - 2021-06-04T15:37:30.425+02:00 - 2021-04-17T12:23:08.200+02:00 - - - - off - - - - maximum_boiler_temperature - C - 2021-01-15T15:05:55.668+01:00 - 2020-11-24T13:21:58.658+01:00 - - - - 90.00 - - - - intended_central_heating_state - - 2021-06-07T07:11:38.810+02:00 - 2021-06-07T07:11:38.810+02:00 - - - - off - - - - burner_operation_time - hr - 2021-06-16T20:57:31+02:00 - 2021-06-16T20:57:31+02:00 - - - - 5566 - - - - open_therm_oem_diagnostic_code - - 2021-06-17T12:49:26.318+02:00 - 2021-06-17T12:49:26.317+02:00 - - - - 0 - - - - failed_burner_starts - - 2021-01-15T19:04:54+01:00 - 2021-01-15T19:04:54+01:00 - - - - 0 - - - - open_therm_application_specific_fault_code - - 2021-06-17T13:38:20.199+02:00 - 2021-03-28T21:03:00.116+02:00 - - - - 0 - - - - central_heater_pump_starts - - 2021-06-16T19:16:08+02:00 - 2021-06-16T19:16:08+02:00 - - - - 3801046 - - - - flame_current - uA - 2021-06-17T12:49:16.230+02:00 - 2021-06-17T12:48:47.969+02:00 - - - - 9.00 - - - - intended_boiler_temperature - C - 2021-06-17T17:18:09.108+02:00 - 2021-06-07T07:11:39.628+02:00 - - - - 0.00 - - - - modulation_level - - 2021-06-17T12:49:06.246+02:00 - 2021-06-17T12:49:06.245+02:00 - - - - 0.00 - - - - domestic_hot_water_burner_starts - - 2021-06-17T12:42:26+02:00 - 2021-06-17T12:42:26+02:00 - - - - 7400 - - - - central_heater_pump_operation_time - hr - 2021-06-17T08:25:01+02:00 - 2021-06-17T08:25:01+02:00 - - - - 6452 - - - - boiler_temperature - C - 2021-06-17T17:32:49.594+02:00 - 2021-06-17T17:32:49.594+02:00 - PT1H - - - 37.30 - - - - domestic_hot_water_burner_operation_time - hr - 2021-06-17T08:25:31+02:00 - 2021-06-17T08:25:31+02:00 - - - - 408 - - - - return_water_temperature - C - 2021-06-17T17:32:37.109+02:00 - 2021-06-17T17:32:37.109+02:00 - PT1H - - - 37.10 - - - - - - 2021-01-15T15:05:43.778+01:00 - domestic_hot_water_setpoint - 60 - 40 - 60 - 0.01 - - - - - - 2021-06-04T15:37:30.430+02:00 - domestic_hot_water_comfort_mode - off - - - 2021-01-15T15:05:55.668+01:00 - maximum_boiler_temperature - 90 - 20 - 90 - 0.01 - - - - - - - Logeerkamer - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2021-01-15T17:25:40.403+01:00 - 2021-06-17T17:25:23.131+02:00 - - - - - - battery - - 2021-06-17T14:15:22.361+02:00 - 2021-06-16T14:21:40.160+02:00 - - - - 0.80 - - - - temperature - C - 2021-06-17T17:25:23.127+02:00 - 2021-06-17T17:25:23.127+02:00 - PT3H - - - 30.00 - - - - thermostat - C - 2021-06-17T14:37:10.091+02:00 - 2021-05-31T16:34:08.450+02:00 - - - - 13.00 - - - - temperature_offset - C - 2021-04-05T12:35:29.613+02:00 - 2021-01-16T04:46:10.219+01:00 - - - - 0.00 - - - - - - - 2021-04-05T12:35:29.613+02:00 - temperature_offset - 0 - - - 2021-06-17T14:37:10.091+02:00 - thermostat - 13 - 0 - 99.9 - 0.01 - - - - - - - Slaapkamer - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2021-01-15T17:52:44.123+01:00 - 2021-06-17T17:22:30.287+02:00 - - - - - - temperature_offset - C - 2021-04-05T12:35:29.716+02:00 - 2021-03-26T23:21:03.063+01:00 - - - - 0.00 - - - - battery - - 2021-06-17T05:47:24.215+02:00 - 2021-06-10T18:13:15.398+02:00 - - - - 0.92 - - - - temperature - C - 2021-06-17T17:22:30.285+02:00 - 2021-06-17T17:22:30.285+02:00 - PT3H - - - 24.20 - - - - thermostat - C - 2021-06-17T15:36:08.595+02:00 - 2021-06-17T15:36:08.568+02:00 - - - - 13.00 - - - - - - - 2021-04-05T12:35:29.716+02:00 - temperature_offset - 0 - - - 2021-06-17T15:36:08.595+02:00 - thermostat - 13 - 0 - 99.9 - 0.01 - - - - - - - Tom Woonkamer - 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-03-28T18:03:01.125+02:00 - 2021-06-17T17:23:44.523+02:00 - - - - - - temperature - C - 2021-06-17T17:23:44.516+02:00 - 2021-06-17T17:23:44.516+02:00 - PT12H - - - 23.96 - - - - thermostat - C - 2021-06-17T09:56:30.863+02:00 - 2021-06-17T09:56:30.788+02:00 - - - - 9.00 - - - - temperature_difference - C - 2021-06-17T08:10:05.321+02:00 - 2021-06-17T08:10:05.321+02:00 - - - - 1.80 - - - - temperature_offset - C - 2021-04-07T05:29:34.159+02:00 - 2021-04-07T05:29:34.159+02:00 - - - - 0.10 - - - - valve_position - - 2021-06-17T07:11:28.241+02:00 - 2021-05-31T06:30:39.422+02:00 - - - - 1.00 - - - - uncorrected_temperature - C - 2021-06-17T17:23:44.517+02:00 - 2021-06-17T16:54:39.977+02:00 - - - - 23.96 - - - - - - - 2021-04-07T05:29:34.160+02:00 - temperature_offset - 0.1 - - - 2021-06-17T09:56:30.863+02:00 - thermostat - 9 - 7 - 30 - 0.01 - - - - - - - OpenThermGateway - An OpenTherm Gateway - open_therm_gateway - 2019-01-30T11:26:57.790+01:00 - 2019-01-30T11:26:59.731+01:00 - - - - - open_therm_power_mode - - 2021-05-31T19:30:27.116+02:00 - 2019-01-30T11:26:59.716+01:00 - - - - 0 - - - - override_mode - - 2021-05-31T19:30:26.694+02:00 - 2019-01-30T11:26:58.140+01:00 - - - - on - - - - - - - Kinderkamer - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2021-01-15T17:43:00.861+01:00 - 2021-06-17T17:31:58.560+02:00 - - - - - - temperature_offset - C - 2021-06-03T09:05:52.661+02:00 - 2021-01-16T00:08:53.988+01:00 - - - - 0.00 - - - - battery - - 2021-06-17T13:16:34.726+02:00 - 2021-06-16T13:23:05.818+02:00 - - - - 0.79 - - - - thermostat - C - 2021-06-17T16:46:42.292+02:00 - 2021-04-21T12:19:10.106+02:00 - - - - 13.00 - - - - temperature - C - 2021-06-17T17:31:58.557+02:00 - 2021-06-17T17:31:58.557+02:00 - PT3H - - - 30.00 - - - - - - - 2021-06-03T09:05:52.661+02:00 - temperature_offset - 0 - - - 2021-06-17T16:46:42.292+02:00 - thermostat - 13 - 0 - 99.9 - 0.01 - - - - - - - Woonkamer - A zone thermometer measured temperature and relative humidity. - zone_thermometer - 2021-05-29T14:43:24.685+02:00 - 2021-06-17T17:23:51.388+02:00 - - - - - - battery - - 2021-06-17T16:54:18.895+02:00 - 2021-06-01T03:00:49.065+02:00 - - - - 1.00 - - - - humidity - RH - 2021-06-17T16:07:26.652+02:00 - 2021-06-17T16:07:26.652+02:00 - PT3H - - - 56.25 - - - - temperature_offset - C - 2021-05-29T14:50:57.932+02:00 - 2021-05-29T14:50:57.932+02:00 - - - - 0.00 - - - - temperature - C - 2021-06-17T17:23:51.383+02:00 - 2021-06-17T17:23:51.383+02:00 - PT3H - - - 27.40 - - - - thermostat - C - 2021-06-17T09:56:30.575+02:00 - 2021-06-17T09:56:30.575+02:00 - - - - 9.00 - - - - - - 2021-06-17T09:56:30.576+02:00 - thermostat - 9 - 4 - 30 - 0.01 - - - - - - 2021-05-29T14:50:57.933+02:00 - temperature_offset - 0 - - - - - Tom Kinderkamer - 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-01-16T18:54:43.437+01:00 - 2021-06-17T17:28:33.416+02:00 - - - - - - valve_position - - 2021-06-17T16:27:35.878+02:00 - 2021-05-02T10:08:47.192+02:00 - - - - 0.00 - - - - temperature_offset - C - 2021-05-26T13:31:19.602+02:00 - 2021-04-07T07:10:30.618+02:00 - - - - 0.10 - - - - thermostat - C - 2021-04-21T12:19:10.335+02:00 - 2021-04-21T12:19:10.335+02:00 - - - - 13.00 - - - - temperature_difference - C - 2021-06-17T16:27:45.276+02:00 - 2021-06-17T16:26:55.687+02:00 - - - - 1.90 - - - - temperature - C - 2021-06-17T17:28:33.411+02:00 - 2021-06-17T17:28:33.411+02:00 - PT12H - - - 28.73 - - - - uncorrected_temperature - C - 2021-06-17T17:28:33.411+02:00 - 2021-06-17T17:28:33.411+02:00 - - - - 28.73 - - - - - - 2021-04-21T12:19:10.336+02:00 - thermostat - 13 - 7 - 30 - 0.01 - - - - - - 2021-05-26T13:31:19.602+02:00 - temperature_offset - 0.1 - - - - - Tom Slaapkamer - 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-01-16T14:06:34.242+01:00 - 2021-06-17T17:27:50.745+02:00 - - - - - - temperature - C - 2021-06-17T17:27:50.735+02:00 - 2021-06-17T17:27:50.735+02:00 - PT12H - - - 24.31 - - - - temperature_offset - C - 2021-05-26T13:31:20.068+02:00 - 2021-04-07T06:25:21.482+02:00 - - - - 0.10 - - - - temperature_difference - C - 2021-06-17T15:34:57.016+02:00 - 2021-06-17T03:34:06.434+02:00 - - - - 1.70 - - - - uncorrected_temperature - C - 2021-06-17T17:27:50.735+02:00 - 2021-06-17T17:27:50.735+02:00 - - - - 24.31 - - - - thermostat - C - 2021-06-17T15:36:04.143+02:00 - 2021-06-17T15:36:04.143+02:00 - - - - 13.00 - - - - valve_position - - 2021-06-17T16:22:53.545+02:00 - 2021-04-27T06:27:07.670+02:00 - - - - 0.00 - - - - - - - 2021-05-26T13:31:20.068+02:00 - temperature_offset - 0.1 - - - 2021-06-17T15:36:04.144+02:00 - thermostat - 13 - 7 - 30 - 0.01 - - - - - - - Gateway D40FB20199D1 - Container for variables logged about the Gateway in general. - gateway - 2019-01-30T11:26:56.858+01:00 - 2021-06-15T13:10:05.139+02:00 - - - - - gateway_mode - - - - - - - - wlan_ip_address - - 2021-06-15T13:10:05.048+02:00 - 2021-05-31T16:31:31+02:00 - - - - 0.0.0.0 - - - - lan_ip_address - - 2021-06-15T13:10:05+02:00 - 2021-06-15T13:10:05+02:00 - - - - 127.0.0.1 - - - - link_quality - - 2021-05-31T16:31:26.490+02:00 - 2021-05-31T16:30:19.502+02:00 - - - - 29 - - - - regulation_mode - - 2021-01-15T17:26:18.023+01:00 - 2020-11-24T04:33:48.149+01:00 - - - - heating - - - - wlan_state - - 2021-06-15T13:10:05.048+02:00 - 2021-05-31T16:31:31.127+02:00 - - - - down - - - - signal_strength - dBm - 2021-05-31T16:31:26.490+02:00 - 2021-05-31T16:30:19.502+02:00 - - - - -81.00 - - - - lan_state - - 2021-06-15T13:10:05.102+02:00 - 2021-06-15T13:10:05.102+02:00 - - - - up - - - - - - - - gateway_mode - full - - setup - light - away - vacation - - full - secure - - - - - 2021-01-15T17:26:18.023+01:00 - regulation_mode - heating - - heating - off - bleeding_cold - bleeding_hot - - - - - - Tom Logeerkamer - 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-01-16T15:56:14.990+01:00 - 2021-06-17T17:21:37.063+02:00 - - - - - - temperature_difference - C - 2021-06-17T16:24:49.009+02:00 - 2021-06-12T04:23:50.096+02:00 - - - - 2.00 - - - - temperature_offset - C - 2021-05-26T13:31:21.452+02:00 - 2021-04-07T07:03:12.609+02:00 - - - - 0.10 - - - - thermostat - C - 2021-05-31T16:33:55.307+02:00 - 2021-05-31T16:33:55.307+02:00 - - - - 13.00 - - - - uncorrected_temperature - C - 2021-06-17T17:21:37.057+02:00 - 2021-06-17T17:21:37.057+02:00 - - - - 28.81 - - - - valve_position - - 2021-06-17T16:24:46.821+02:00 - 2021-05-31T07:15:39.557+02:00 - - - - 0.00 - - - - temperature - C - 2021-06-17T17:21:37.057+02:00 - 2021-06-17T17:21:37.057+02:00 - PT12H - - - 28.81 - - - - - - - 2021-05-26T13:31:21.452+02:00 - temperature_offset - 0.1 - - - 2021-05-31T16:33:55.308+02:00 - thermostat - 13 - 7 - 30 - 0.01 - - - - - - - Plug - A device that communicates through the ZigBee protocol. - zz_misc - 2021-05-26T13:31:39.642+02:00 - 2021-06-17T17:29:34.795+02:00 - - - - - electricity_produced - Wh - - - PT15M - - - - relay - - 2021-06-17T17:29:34.792+02:00 - 2021-06-10T22:38:28.606+02:00 - - - - off - - - - electricity_consumed - Wh - 2021-06-17T17:15:00+02:00 - 2021-06-17T17:00:00+02:00 - PT15M - - - 0.00 - - - - - - 2021-06-17T17:29:34.792+02:00 - true - off - - - - - diff --git a/userdata/adam_jip/core.direct_objects.xml b/userdata/adam_jip/core.direct_objects.xml deleted file mode 100644 index a3ee875e0..000000000 --- a/userdata/adam_jip/core.direct_objects.xml +++ /dev/null @@ -1,1639 +0,0 @@ - - - - Gateway D40FB20199D1 - Container for variables logged about the Gateway in general. - gateway - 2019-01-30T11:26:56.858+01:00 - 2021-06-15T13:10:05.139+02:00 - - - - - gateway_mode - - - - - - - - wlan_ip_address - - 2021-06-15T13:10:05.048+02:00 - 2021-05-31T16:31:31+02:00 - - - - 0.0.0.0 - - - - lan_ip_address - - 2021-06-15T13:10:05+02:00 - 2021-06-15T13:10:05+02:00 - - - - 127.0.0.1 - - - - link_quality - - 2021-05-31T16:31:26.490+02:00 - 2021-05-31T16:30:19.502+02:00 - - - - 29 - - - - regulation_mode - - 2021-01-15T17:26:18.023+01:00 - 2020-11-24T04:33:48.149+01:00 - - - - heating - - - - wlan_state - - 2021-06-15T13:10:05.048+02:00 - 2021-05-31T16:31:31.127+02:00 - - - - down - - - - signal_strength - dBm - 2021-05-31T16:31:26.490+02:00 - 2021-05-31T16:30:19.502+02:00 - - - - -81.00 - - - - lan_state - - 2021-06-15T13:10:05.102+02:00 - 2021-06-15T13:10:05.102+02:00 - - - - up - - - - - - - - gateway_mode - full - - setup - light - away - vacation - - full - secure - - - - - 2021-01-15T17:26:18.023+01:00 - regulation_mode - heating - - heating - off - bleeding_cold - bleeding_hot - - - - - - Kinderkamer - - nursery - 2021-01-14T19:55:34.878+01:00 - 2021-06-17T17:31:58.571+02:00 - - home - - - - - - - - thermostat - C - 2021-05-29T19:02:36.575+02:00 - 2021-04-21T12:19:10.106+02:00 - - - 13.00 - - - - temperature - C - 2021-06-17T17:31:58.557+02:00 - 2021-06-04T15:28:39.356+02:00 - PT3H - - 30.00 - - - - - - 2021-05-29T19:02:36.576+02:00 - thermostat - 13 - 0 - 99.9 - 0.01 - - true - true - off - active - - - - - Kinderkamer - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2021-01-15T17:43:00.861+01:00 - 2021-06-17T17:31:58.560+02:00 - - - - - - temperature_offset - C - 2021-06-03T09:05:52.661+02:00 - 2021-01-16T00:08:53.988+01:00 - - - - 0.00 - - - - battery - - 2021-06-17T13:16:34.726+02:00 - 2021-06-16T13:23:05.818+02:00 - - - - 0.79 - - - - thermostat - C - 2021-06-17T16:46:42.292+02:00 - 2021-04-21T12:19:10.106+02:00 - - - - 13.00 - - - - temperature - C - 2021-06-17T17:31:58.557+02:00 - 2021-06-17T17:31:58.557+02:00 - PT3H - - - 30.00 - - - - - - - 2021-06-03T09:05:52.661+02:00 - temperature_offset - 0 - - - 2021-06-17T16:46:42.292+02:00 - thermostat - 13 - 0 - 99.9 - 0.01 - - - - - - - OpenThermGateway - An OpenTherm Gateway - open_therm_gateway - 2019-01-30T11:26:57.790+01:00 - 2019-01-30T11:26:59.731+01:00 - - - - - open_therm_power_mode - - 2021-05-31T19:30:27.116+02:00 - 2019-01-30T11:26:59.716+01:00 - - - - 0 - - - - override_mode - - 2021-05-31T19:30:26.694+02:00 - 2019-01-30T11:26:58.140+01:00 - - - - on - - - - - - - Slaapkamer - - bedroom - 2021-01-14T19:55:19.399+01:00 - 2021-06-17T17:22:30.294+02:00 - - no_frost - - - - - - - - temperature - C - 2021-06-17T17:22:30.285+02:00 - 2021-06-04T15:32:16.593+02:00 - PT3H - - 24.20 - - - - thermostat - C - 2021-06-17T15:36:08.568+02:00 - 2021-06-04T07:45:23.653+02:00 - - - 13.00 - - - - - - 2021-06-17T15:36:03.992+02:00 - thermostat - 13 - 0 - 99.9 - 0.01 - - true - true - off - active - - - - - Kinderkamer - 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-01-16T18:54:43.437+01:00 - 2021-06-17T17:28:33.416+02:00 - - - - - - valve_position - - 2021-06-17T16:27:35.878+02:00 - 2021-05-02T10:08:47.192+02:00 - - - - 0.00 - - - - temperature_offset - C - 2021-05-26T13:31:19.602+02:00 - 2021-04-07T07:10:30.618+02:00 - - - - 0.10 - - - - thermostat - C - 2021-04-21T12:19:10.335+02:00 - 2021-04-21T12:19:10.335+02:00 - - - - 13.00 - - - - temperature_difference - C - 2021-06-17T16:27:45.276+02:00 - 2021-06-17T16:26:55.687+02:00 - - - - 1.90 - - - - temperature - C - 2021-06-17T17:28:33.411+02:00 - 2021-06-17T17:28:33.411+02:00 - PT12H - - - 28.73 - - - - uncorrected_temperature - C - 2021-06-17T17:28:33.411+02:00 - 2021-06-17T17:28:33.411+02:00 - - - - 28.73 - - - - - - 2021-04-21T12:19:10.336+02:00 - thermostat - 13 - 7 - 30 - 0.01 - - - - - - 2021-05-26T13:31:19.602+02:00 - temperature_offset - 0.1 - - - - - Slaapkamer - 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-01-16T14:06:34.242+01:00 - 2021-06-17T17:33:00.849+02:00 - - - - - - temperature - C - 2021-06-17T17:33:00.844+02:00 - 2021-06-17T17:33:00.844+02:00 - PT12H - - - 24.16 - - - - temperature_offset - C - 2021-05-26T13:31:20.068+02:00 - 2021-04-07T06:25:21.482+02:00 - - - - 0.10 - - - - temperature_difference - C - 2021-06-17T15:34:57.016+02:00 - 2021-06-17T03:34:06.434+02:00 - - - - 1.70 - - - - uncorrected_temperature - C - 2021-06-17T17:33:00.844+02:00 - 2021-06-17T17:33:00.844+02:00 - - - - 24.16 - - - - thermostat - C - 2021-06-17T15:36:04.143+02:00 - 2021-06-17T15:36:04.143+02:00 - - - - 13.00 - - - - valve_position - - 2021-06-17T16:22:53.545+02:00 - 2021-04-27T06:27:07.670+02:00 - - - - 0.00 - - - - - - - 2021-05-26T13:31:20.068+02:00 - temperature_offset - 0.1 - - - 2021-06-17T15:36:04.144+02:00 - thermostat - 13 - 7 - 30 - 0.01 - - - - - - - Plug - A device that communicates through the ZigBee protocol. - zz_misc - 2021-05-26T13:31:39.642+02:00 - 2021-06-17T17:29:34.795+02:00 - - - - - electricity_produced - Wh - - - PT15M - - - - relay - - 2021-06-17T17:29:34.792+02:00 - 2021-06-10T22:38:28.606+02:00 - - - - off - - - - electricity_consumed - Wh - 2021-06-17T17:15:00+02:00 - 2021-06-17T17:00:00+02:00 - PT15M - - - 0.00 - - - - - - 2021-06-17T17:29:34.792+02:00 - true - off - - - - - - Toon - A Thermostat - thermostat - 2020-11-24T13:22:01.670+01:00 - 2021-06-17T17:32:58.427+02:00 - - - - - intended_central_heating_state - - 2021-06-17T17:30:48.582+02:00 - 2021-06-04T15:47:05.188+02:00 - - - - off - - - - thermostat - C - 2021-06-17T17:32:43.316+02:00 - 2021-06-17T09:56:30.525+02:00 - - - - 9.00 - - - - temperature - C - 2021-06-17T17:32:58.415+02:00 - 2021-06-17T17:32:58.414+02:00 - PT3H - - - 27.70 - - - - maximum_modulation_level - - 2021-01-15T20:17:15.160+01:00 - 2021-01-15T17:27:03.869+01:00 - - - - 1.00 - - - - intended_domestic_hot_water_comfort_mode - - 2021-06-17T17:30:48.582+02:00 - 2021-06-17T06:31:23.701+02:00 - - - - on - - - - - - 2021-06-17T17:32:43.316+02:00 - thermostat - 9 - 1 - 35 - 0.01 - - - - - - - Central heating boiler - - heater_central - 2019-01-30T19:15:31.166+01:00 - 2021-06-17T17:32:49.622+02:00 - - - - - central_heating_state - - 2021-06-07T07:11:43.018+02:00 - 2021-06-07T07:11:43.018+02:00 - - - - off - - - - domestic_hot_water_pump_operation_time - hr - 2021-06-17T16:38:44+02:00 - 2021-06-17T16:38:44+02:00 - - - - 23842 - - - - domestic_hot_water_setpoint - C - 2021-01-15T15:05:43.778+01:00 - 2020-11-24T13:21:48.127+01:00 - - - - 60.00 - - - - open_therm_oem_fault_code - - 2021-06-17T13:38:20.199+02:00 - 2020-11-24T13:21:50.656+01:00 - - - - 255 - - - - domestic_hot_water_comfort_mode - - 2021-06-04T15:37:30.430+02:00 - 2021-02-19T23:30:36.819+01:00 - - - - off - - - - flame_state - - 2021-06-17T12:49:02.945+02:00 - 2021-06-17T12:49:02.945+02:00 - - - - off - - - - boiler_fan_speed_setpoint - Hz - 2021-06-17T12:49:43.784+02:00 - 2021-06-17T12:49:43.783+02:00 - - - - 0.00 - - - - central_heater_water_pressure - bar - 2021-06-17T14:58:01.736+02:00 - 2021-06-17T14:58:01.735+02:00 - - - - 1.40 - - - - burner_operation_time - s - 2021-06-17T17:00:00+02:00 - 2021-06-17T16:00:00+02:00 - PT1H - - - 0 - - - - failed_burner_flame_ignitions - - 2021-01-15T19:04:55+01:00 - 2021-01-15T19:04:55+01:00 - - - - 0 - - - - domestic_hot_water_state - - 2021-06-17T12:49:02.937+02:00 - 2021-06-17T12:49:02.937+02:00 - - - - off - - - - burner_starts - - 2021-06-17T12:42:24+02:00 - 2021-06-17T12:42:24+02:00 - - - - 15344 - - - - domestic_hot_water_pump_starts - - 2021-06-17T08:14:27+02:00 - 2021-06-17T08:14:27+02:00 - - - - 650375 - - - - boiler_fan_speed - Hz - 2021-06-17T12:49:43.784+02:00 - 2021-06-17T12:49:43.783+02:00 - - - - 0.00 - - - - cooling_state - - 2021-06-04T15:37:30.425+02:00 - 2021-04-17T12:23:08.200+02:00 - - - - off - - - - maximum_boiler_temperature - C - 2021-01-15T15:05:55.668+01:00 - 2020-11-24T13:21:58.658+01:00 - - - - 90.00 - - - - intended_central_heating_state - - 2021-06-07T07:11:38.810+02:00 - 2021-06-07T07:11:38.810+02:00 - - - - off - - - - burner_operation_time - hr - 2021-06-16T20:57:31+02:00 - 2021-06-16T20:57:31+02:00 - - - - 5566 - - - - open_therm_oem_diagnostic_code - - 2021-06-17T12:49:26.318+02:00 - 2021-06-17T12:49:26.317+02:00 - - - - 0 - - - - failed_burner_starts - - 2021-01-15T19:04:54+01:00 - 2021-01-15T19:04:54+01:00 - - - - 0 - - - - open_therm_application_specific_fault_code - - 2021-06-17T13:38:20.199+02:00 - 2021-03-28T21:03:00.116+02:00 - - - - 0 - - - - central_heater_pump_starts - - 2021-06-16T19:16:08+02:00 - 2021-06-16T19:16:08+02:00 - - - - 3801046 - - - - flame_current - uA - 2021-06-17T12:49:16.230+02:00 - 2021-06-17T12:48:47.969+02:00 - - - - 9.00 - - - - intended_boiler_temperature - C - 2021-06-17T17:18:09.108+02:00 - 2021-06-07T07:11:39.628+02:00 - - - - 0.00 - - - - modulation_level - - 2021-06-17T12:49:06.246+02:00 - 2021-06-17T12:49:06.245+02:00 - - - - 0.00 - - - - domestic_hot_water_burner_starts - - 2021-06-17T12:42:26+02:00 - 2021-06-17T12:42:26+02:00 - - - - 7400 - - - - central_heater_pump_operation_time - hr - 2021-06-17T08:25:01+02:00 - 2021-06-17T08:25:01+02:00 - - - - 6452 - - - - boiler_temperature - C - 2021-06-17T17:32:49.594+02:00 - 2021-06-17T17:32:49.594+02:00 - PT1H - - - 37.30 - - - - domestic_hot_water_burner_operation_time - hr - 2021-06-17T08:25:31+02:00 - 2021-06-17T08:25:31+02:00 - - - - 408 - - - - return_water_temperature - C - 2021-06-17T17:32:37.109+02:00 - 2021-06-17T17:32:37.109+02:00 - PT1H - - - 37.10 - - - - - - - 2021-06-04T15:37:30.430+02:00 - domestic_hot_water_comfort_mode - off - - - 2021-01-15T15:05:55.668+01:00 - maximum_boiler_temperature - 90 - 20 - 90 - 0.01 - - - - - 2021-01-15T15:05:43.778+01:00 - domestic_hot_water_setpoint - 60 - 40 - 60 - 0.01 - - - - - - - Logeerkamer - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2021-01-15T17:25:40.403+01:00 - 2021-06-17T17:25:23.131+02:00 - - - - - - battery - - 2021-06-17T14:15:22.361+02:00 - 2021-06-16T14:21:40.160+02:00 - - - - 0.80 - - - - temperature - C - 2021-06-17T17:25:23.127+02:00 - 2021-06-17T17:25:23.127+02:00 - PT3H - - - 30.00 - - - - thermostat - C - 2021-06-17T14:37:10.091+02:00 - 2021-05-31T16:34:08.450+02:00 - - - - 13.00 - - - - temperature_offset - C - 2021-04-05T12:35:29.613+02:00 - 2021-01-16T04:46:10.219+01:00 - - - - 0.00 - - - - - - - 2021-04-05T12:35:29.613+02:00 - temperature_offset - 0 - - - 2021-06-17T14:37:10.091+02:00 - thermostat - 13 - 0 - 99.9 - 0.01 - - - - - - - Slaapkamer - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2021-01-15T17:52:44.123+01:00 - 2021-06-17T17:22:30.287+02:00 - - - - - - temperature_offset - C - 2021-04-05T12:35:29.716+02:00 - 2021-03-26T23:21:03.063+01:00 - - - - 0.00 - - - - battery - - 2021-06-17T05:47:24.215+02:00 - 2021-06-10T18:13:15.398+02:00 - - - - 0.92 - - - - temperature - C - 2021-06-17T17:22:30.285+02:00 - 2021-06-17T17:22:30.285+02:00 - PT3H - - - 24.20 - - - - thermostat - C - 2021-06-17T15:36:08.595+02:00 - 2021-06-17T15:36:08.568+02:00 - - - - 13.00 - - - - - - - 2021-04-05T12:35:29.716+02:00 - temperature_offset - 0 - - - 2021-06-17T15:36:08.595+02:00 - thermostat - 13 - 0 - 99.9 - 0.01 - - - - - - - Woonkamer - 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-03-28T18:03:01.125+02:00 - 2021-06-17T17:23:44.523+02:00 - - - - - - temperature - C - 2021-06-17T17:23:44.516+02:00 - 2021-06-17T17:23:44.516+02:00 - PT12H - - - 23.96 - - - - thermostat - C - 2021-06-17T09:56:30.863+02:00 - 2021-06-17T09:56:30.788+02:00 - - - - 9.00 - - - - temperature_difference - C - 2021-06-17T08:10:05.321+02:00 - 2021-06-17T08:10:05.321+02:00 - - - - 1.80 - - - - temperature_offset - C - 2021-04-07T05:29:34.159+02:00 - 2021-04-07T05:29:34.159+02:00 - - - - 0.10 - - - - valve_position - - 2021-06-17T07:11:28.241+02:00 - 2021-05-31T06:30:39.422+02:00 - - - - 1.00 - - - - uncorrected_temperature - C - 2021-06-17T17:23:44.517+02:00 - 2021-06-17T16:54:39.977+02:00 - - - - 23.96 - - - - - - - 2021-04-07T05:29:34.160+02:00 - temperature_offset - 0.1 - - - 2021-06-17T09:56:30.863+02:00 - thermostat - 9 - 7 - 30 - 0.01 - - - - - - - Woonkamer - A zone thermometer measured temperature and relative humidity. - zone_thermometer - 2021-05-29T14:43:24.685+02:00 - 2021-06-17T17:23:51.388+02:00 - - - - - - battery - - 2021-06-17T16:54:18.895+02:00 - 2021-06-01T03:00:49.065+02:00 - - - - 1.00 - - - - humidity - RH - 2021-06-17T16:07:26.652+02:00 - 2021-06-17T16:07:26.652+02:00 - PT3H - - - 56.25 - - - - temperature_offset - C - 2021-05-29T14:50:57.932+02:00 - 2021-05-29T14:50:57.932+02:00 - - - - 0.00 - - - - temperature - C - 2021-06-17T17:23:51.383+02:00 - 2021-06-17T17:23:51.383+02:00 - PT3H - - - 27.40 - - - - thermostat - C - 2021-06-17T09:56:30.575+02:00 - 2021-06-17T09:56:30.575+02:00 - - - - 9.00 - - - - - - 2021-06-17T09:56:30.576+02:00 - thermostat - 9 - 4 - 30 - 0.01 - - - - - - 2021-05-29T14:50:57.933+02:00 - temperature_offset - 0 - - - - - Logeerkamer - - guestroom - 2021-01-14T19:55:43.128+01:00 - 2021-06-17T17:25:23.140+02:00 - - home - - - - - - - - thermostat - C - 2021-05-31T16:34:08.450+02:00 - 2021-05-31T06:30:27.331+02:00 - - - 13.00 - - - - temperature - C - 2021-06-17T17:25:23.127+02:00 - 2021-06-04T15:28:58.650+02:00 - PT3H - - 30.00 - - - - - - 2021-05-31T16:31:10.008+02:00 - thermostat - 13 - 0 - 99.9 - 0.01 - - true - true - off - active - - - - - Home - - building - 2019-01-30T11:26:50.383+01:00 - 2021-06-17T17:21:44.930+02:00 - - home - - - - - weather_description - - 2021-06-17T17:21:44+02:00 - 2021-06-17T17:21:44+02:00 - - - - overcast - - - - solar_irradiance - W_m2 - 2021-06-17T17:21:44+02:00 - 2021-06-17T17:21:44+02:00 - - - - 449.25 - - - - wind_vector - m_s - 2021-06-17T17:21:44+02:00 - 2021-06-17T17:21:44+02:00 - - - - (2.68,216.00) - - - - humidity - RH - 2021-06-17T17:21:44+02:00 - 2021-06-17T17:21:44+02:00 - PT3H - - - 68.00 - - - - outdoor_temperature - C - 2021-06-17T17:21:44+02:00 - 2021-06-17T17:21:44+02:00 - PT3H - - - 24.94 - - - - - - - Logeerkamer - 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-01-16T15:56:14.990+01:00 - 2021-06-17T17:21:37.063+02:00 - - - - - - temperature_difference - C - 2021-06-17T16:24:49.009+02:00 - 2021-06-12T04:23:50.096+02:00 - - - - 2.00 - - - - temperature_offset - C - 2021-05-26T13:31:21.452+02:00 - 2021-04-07T07:03:12.609+02:00 - - - - 0.10 - - - - thermostat - C - 2021-05-31T16:33:55.307+02:00 - 2021-05-31T16:33:55.307+02:00 - - - - 13.00 - - - - uncorrected_temperature - C - 2021-06-17T17:21:37.057+02:00 - 2021-06-17T17:21:37.057+02:00 - - - - 28.81 - - - - valve_position - - 2021-06-17T16:24:46.821+02:00 - 2021-05-31T07:15:39.557+02:00 - - - - 0.00 - - - - temperature - C - 2021-06-17T17:21:37.057+02:00 - 2021-06-17T17:21:37.057+02:00 - PT12H - - - 28.81 - - - - - - - 2021-05-26T13:31:21.452+02:00 - temperature_offset - 0.1 - - - 2021-05-31T16:33:55.308+02:00 - thermostat - 13 - 7 - 30 - 0.01 - - - - - - - Woonkamer - - livingroom - 2021-05-31T16:10:18.241+02:00 - 2021-06-17T17:23:51.396+02:00 - - home - - - - - - - - temperature - C - 2021-06-17T17:23:51.383+02:00 - 2021-06-04T15:25:08.833+02:00 - PT3H - - 27.40 - - - - relay - - - - - - - humidity - RH - 2021-06-17T16:07:26.652+02:00 - 2021-06-04T13:30:04.682+02:00 - PT3H - - 56.25 - - - - thermostat - C - 2021-06-17T09:56:30.575+02:00 - 2021-05-31T16:25:49.565+02:00 - - - 9.00 - - - - - - 2021-06-17T09:56:30.576+02:00 - thermostat - 9 - 4 - 30 - 0.01 - - true - true - off - active - - - - diff --git a/userdata/adam_jip/core.locations.xml b/userdata/adam_jip/core.locations.xml deleted file mode 100644 index d06ff11c6..000000000 --- a/userdata/adam_jip/core.locations.xml +++ /dev/null @@ -1,293 +0,0 @@ - - - - Woonkamer - - livingroom - 2021-05-31T16:10:18.241+02:00 - 2021-06-17T17:23:51.396+02:00 - - home - - - - - - - - temperature - C - 2021-06-17T17:23:51.383+02:00 - 2021-06-04T15:25:08.833+02:00 - PT3H - - 27.40 - - - - relay - - - - - - - humidity - RH - 2021-06-17T16:07:26.652+02:00 - 2021-06-04T13:30:04.682+02:00 - PT3H - - 56.25 - - - - thermostat - C - 2021-06-17T09:56:30.575+02:00 - 2021-05-31T16:25:49.565+02:00 - - - 9.00 - - - - - - 2021-06-17T09:56:30.576+02:00 - thermostat - 9 - 4 - 30 - 0.01 - - true - true - off - active - - - - - Slaapkamer - - bedroom - 2021-01-14T19:55:19.399+01:00 - 2021-06-17T17:22:30.294+02:00 - - no_frost - - - - - - - - temperature - C - 2021-06-17T17:22:30.285+02:00 - 2021-06-04T15:32:16.593+02:00 - PT3H - - 24.20 - - - - thermostat - C - 2021-06-17T15:36:08.568+02:00 - 2021-06-04T07:45:23.653+02:00 - - - 13.00 - - - - - - 2021-06-17T15:36:03.992+02:00 - thermostat - 13 - 0 - 99.9 - 0.01 - - true - true - off - active - - - - - Logeerkamer - - guestroom - 2021-01-14T19:55:43.128+01:00 - 2021-06-17T17:25:23.140+02:00 - - home - - - - - - - - thermostat - C - 2021-05-31T16:34:08.450+02:00 - 2021-05-31T06:30:27.331+02:00 - - - 13.00 - - - - temperature - C - 2021-06-17T17:25:23.127+02:00 - 2021-06-04T15:28:58.650+02:00 - PT3H - - 30.00 - - - - - - 2021-05-31T16:31:10.008+02:00 - thermostat - 13 - 0 - 99.9 - 0.01 - - true - true - off - active - - - - - Kinderkamer - - nursery - 2021-01-14T19:55:34.878+01:00 - 2021-06-17T17:31:58.571+02:00 - - home - - - - - - - - thermostat - C - 2021-05-29T19:02:36.575+02:00 - 2021-04-21T12:19:10.106+02:00 - - - 13.00 - - - - temperature - C - 2021-06-17T17:31:58.557+02:00 - 2021-06-04T15:28:39.356+02:00 - PT3H - - 30.00 - - - - - - 2021-05-29T19:02:36.576+02:00 - thermostat - 13 - 0 - 99.9 - 0.01 - - true - true - off - active - - - - - Home - - building - 2019-01-30T11:26:50.383+01:00 - 2021-06-17T17:21:44.930+02:00 - - home - - - - - weather_description - - 2021-06-17T17:21:44+02:00 - 2021-06-17T17:21:44+02:00 - - - - overcast - - - - solar_irradiance - W_m2 - 2021-06-17T17:21:44+02:00 - 2021-06-17T17:21:44+02:00 - - - - 449.25 - - - - wind_vector - m_s - 2021-06-17T17:21:44+02:00 - 2021-06-17T17:21:44+02:00 - - - - (2.68,216.00) - - - - humidity - RH - 2021-06-17T17:21:44+02:00 - 2021-06-17T17:21:44+02:00 - PT3H - - - 68.00 - - - - outdoor_temperature - C - 2021-06-17T17:21:44+02:00 - 2021-06-17T17:21:44+02:00 - PT3H - - - 24.94 - - - - - - diff --git a/userdata/adam_jip/core.modules.xml b/userdata/adam_jip/core.modules.xml deleted file mode 100644 index 4ce4bbc48..000000000 --- a/userdata/adam_jip/core.modules.xml +++ /dev/null @@ -1,599 +0,0 @@ - - - - Plugwise - Gateway - AME Smile 2.0 board - - 2019-01-30T11:26:49.894+01:00 - 2021-04-07T05:22:59.822+02:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Remeha B.V. - 10.20 - - - 2019-01-30T19:15:31.007+01:00 - 2021-01-14T19:07:48.767+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3.0 - true - 33 - 18 - false - false - false - true - false - true - true - smart_grid_off - off - - - - - LUMI - lumi.plug.maeu01 - - - - 2021-05-26T13:31:16.946+02:00 - 2021-05-26T13:31:40.173+02:00 - - - - - - - - - - - - ABCD012345670A06 - router - true - mains - - - - - - - Plugwise - 106-03 - 1 - 2020-11-04T01:00:00+01:00 - - 2021-01-16T15:56:14.676+01:00 - 2021-04-07T07:03:11.178+02:00 - - - - - - - - - - - - - - - - - - - - - - - - ABCD012345670A07 - router - true - mains - true - 0 - - - - - - - - - - - 2019-01-30T11:26:50.159+01:00 - 2020-11-24T04:33:55.097+01:00 - - - - - - - - - - - - - - - - - - - - - - - - Quby B.V. - - - - 2020-11-24T13:22:01.182+01:00 - 2021-06-04T15:37:42.099+02:00 - - - - - - - - - - - - - - - - - - - - - 0.0 - - - - - - Plugwise - 158-01 - 255 - 2016-10-27T02:00:00+02:00 - - 2021-01-15T17:25:39.480+01:00 - 2021-01-16T18:29:35.654+01:00 - - - - - - - - - - - - - - - - - - ABCD012345670A01 - end_device - true - battery - - - - - - - Plugwise - 106-03 - 1 - 2020-11-04T01:00:00+01:00 - - 2021-01-16T18:54:43.146+01:00 - 2021-04-07T07:10:29.963+02:00 - - - - - - - - - - - - - - - - - - - - - - - - ABCD012345670A04 - router - true - mains - true - 0 - - - - - - - Plugwise - 158-01 - 255 - 2016-10-27T02:00:00+02:00 - - 2021-01-15T17:42:59.767+01:00 - 2021-01-16T18:29:37.722+01:00 - - - - - - - - - - - - - - - - - - ABCD012345670A02 - end_device - true - battery - - - - - - - Telegesis - ETRX3USB - - - 2020-11-23T15:45:51.211+01:00 - 2020-11-23T15:45:51.323+01:00 - - - - - ABCD012345670101 - false - - - - - - - Plugwise - 106-03 - 1 - 2020-11-04T01:00:00+01:00 - - 2021-01-16T14:06:33.965+01:00 - 2021-04-07T06:25:20.339+02:00 - - - - - - - - - - - - - - - - - - - - - - - - ABCD012345670A05 - router - true - mains - true - 0 - - - - - - - Plugwise - 158-01 - 255 - 2016-10-27T02:00:00+02:00 - - 2021-01-15T17:52:43.221+01:00 - 2021-01-15T17:54:22.140+01:00 - - - - - - - - - - - - - - - - - - ABCD012345670A03 - end_device - true - battery - - - - - - - Plugwise - Adam - 6539-1601-4502 - 2018-10-30T10:12:41+01:00 - 2019-01-30T11:26:55.673+01:00 - 2019-01-30T11:41:58.315+01:00 - - - - - - - - - - - - 16-50-001-064 - - - - - - - Plugwise - 106-03 - 1 - 2020-11-04T01:00:00+01:00 - - 2021-03-28T18:03:00.736+02:00 - 2021-04-07T05:29:32.887+02:00 - - - - - - - - - - - - - - - - - - - - - - - - ABCD012345670A09 - router - true - mains - true - 0 - - - - - - - Plugwise - 168-01 - 1 - 2020-09-01T02:00:00+02:00 - - 2021-05-29T14:43:18.550+02:00 - 2021-05-30T02:46:44.260+02:00 - - - - - - - - - - - - - - - - - - - - - ABCD012345670A08 - end_device - true - battery - - - - - - diff --git a/userdata/adam_multiple_devices_per_zone/core.appliances.xml b/userdata/adam_multiple_devices_per_zone/core.appliances.xml deleted file mode 100644 index 29077c30f..000000000 --- a/userdata/adam_multiple_devices_per_zone/core.appliances.xml +++ /dev/null @@ -1,1543 +0,0 @@ - - - - Zone Lisa Bios - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2019-01-24T20:55:13.905+01:00 - 2020-03-20T17:40:49.475+01:00 - - - - - - 2020-03-20T17:40:49.470+01:00 - temperature - C - 2020-03-20T17:40:49.470+01:00 - - 16.50 - - - - - 2020-03-20T07:40:13.803+01:00 - battery - - 2020-03-15T19:54:42.318+01:00 - - 0.67 - - - - - 2020-03-20T08:22:10.252+01:00 - thermostat - C - 2020-03-19T08:25:49.033+01:00 - - 13.00 - - - - - 2020-01-30T17:35:06.817+01:00 - temperature_offset - C - 2019-01-24T20:55:28.943+01:00 - - 0.00 - - - - - - - 2020-03-20T08:22:10.252+01:00 - thermostat - 13 - 0 - 99.9 - 0.01 - - - - - - 2020-01-30T17:35:06.817+01:00 - temperature_offset - 0 - - - - - Floor kraan - 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 - 2019-01-14T16:45:47.777+01:00 - 2020-03-20T17:45:33.522+01:00 - - - - - - 2020-03-20T12:15:29.245+01:00 - valve_position - - 2020-03-20T12:15:29.245+01:00 - - 1.00 - - - - - 2020-03-20T17:45:33.518+01:00 - temperature_difference - C - 2020-03-20T17:45:33.518+01:00 - - 3.50 - - - - - 2020-03-20T17:38:32.488+01:00 - uncorrected_temperature - C - 2020-03-20T17:38:32.488+01:00 - - 25.85 - - - - - 2020-03-20T08:55:08.044+01:00 - thermostat - C - 2020-03-20T08:55:08.044+01:00 - - 21.50 - - - - - 2020-03-20T17:38:32.488+01:00 - temperature - C - 2020-03-20T17:38:32.488+01:00 - - 26.04 - - - - - 2019-12-24T21:47:20.951+01:00 - temperature_offset - C - 2019-01-14T16:45:58.634+01:00 - - 0.00 - - - - - - - - 2019-12-24T21:47:20.951+01:00 - temperature_offset - 0 - - - 2020-03-20T08:55:08.045+01:00 - thermostat - 21.5 - 0 - 99.99 - 0.01 - - - - - - - Bios Cv Thermostatic Radiator - 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 - 2019-01-24T20:53:13.633+01:00 - 2020-03-20T17:39:08.025+01:00 - - - - - - 2020-03-20T17:39:08.019+01:00 - uncorrected_temperature - C - 2020-03-20T17:24:43.135+01:00 - - 17.16 - - - - - 2020-02-16T18:48:56.608+01:00 - temperature_offset - C - 2019-01-24T20:53:33.959+01:00 - - 0.00 - - - - - 2020-03-20T17:13:33.141+01:00 - temperature_difference - C - 2020-03-20T14:40:16.878+01:00 - - -0.20 - - - - - 2020-03-20T17:39:08.018+01:00 - temperature - C - 2020-03-20T17:39:08.018+01:00 - - 17.16 - - - - - 2020-03-19T08:26:41.317+01:00 - thermostat - C - 2020-03-19T08:26:35.396+01:00 - - 13.00 - - - - - 2020-03-20T12:02:21.727+01:00 - valve_position - - 2020-03-15T00:48:58.016+01:00 - - 0.00 - - - - - 2020-03-20T14:21:55.399+01:00 - battery - - 2020-03-18T14:39:05.500+01:00 - - 0.62 - - - - - - - - 2020-02-16T18:48:56.608+01:00 - temperature_offset - 0 - - - 2020-03-19T08:26:41.317+01:00 - thermostat - 13 - 0 - 99.99 - 0.01 - - - - - - - Zone Lisa WK - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2019-01-14T16:59:21.855+01:00 - 2020-03-20T17:44:59.632+01:00 - - - - - - - - 2020-03-20T17:44:59.628+01:00 - temperature - C - 2020-03-20T17:44:59.628+01:00 - - 20.90 - - - - - 2020-03-20T08:55:11.798+01:00 - thermostat - C - 2020-03-20T08:55:11.706+01:00 - - 21.50 - - - - - 2020-03-20T15:51:12.192+01:00 - battery - - 2020-03-18T16:12:33.910+01:00 - - 0.34 - - - - - 2020-01-30T17:35:25.361+01:00 - temperature_offset - C - 2019-01-14T17:00:05.062+01:00 - - 0.00 - - - - - - - - 2020-01-30T17:35:25.361+01:00 - temperature_offset - 0 - - - 2020-03-20T08:55:11.798+01:00 - thermostat - 21.5 - 0 - 99.9 - 0.01 - - - - - - - Gateway D40FB201C949 - Container for variables logged about the Gateway in general. - gateway - 2018-10-29T14:06:47.624+01:00 - 2020-03-20T16:44:31.571+01:00 - - - - - 2020-03-20T16:44:31.526+01:00 - wlan_ip_address - - 2020-02-20T10:40:44+01:00 - - 127.0.0.1 - - - - - 2020-03-20T16:44:31.525+01:00 - signal_strength - dBm - 2020-03-20T16:44:31.525+01:00 - - -32.00 - - - - - 2020-03-20T16:44:30.528+01:00 - lan_state - - 2018-10-29T14:08:05.107+01:00 - - down - - - - - 2020-03-20T16:44:31.526+01:00 - wlan_state - - 2020-02-19T21:33:48.007+01:00 - - up - - - - - 2020-01-15T15:41:43.957+01:00 - regulation_mode - - - - heating - - - - - 2020-03-20T16:44:31.526+01:00 - link_quality - - 2020-03-20T00:39:40.480+01:00 - - 70 - - - - - - - - 2020-01-15T15:41:43.957+01:00 - regulation_mode - heating - - - - - Thermostatic Radiator Jessie - 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 - 2018-12-10T11:32:43.255+01:00 - 2020-03-20T17:37:20.104+01:00 - - - - - - 2020-03-20T17:06:16.944+01:00 - valve_position - - 2020-03-14T06:00:28.153+01:00 - - 0.00 - - - - - 2020-03-20T17:29:36.884+01:00 - temperature_difference - C - 2020-03-20T17:29:36.884+01:00 - - 0.10 - - - - - 2020-03-20T15:03:58.067+01:00 - battery - - 2020-03-20T15:03:58.067+01:00 - - 0.62 - - - - - 2020-03-20T17:37:20.097+01:00 - temperature - C - 2020-03-20T17:37:20.097+01:00 - - 17.10 - - - - - 2020-03-20T07:15:11.732+01:00 - thermostat - C - 2020-03-20T07:15:11.732+01:00 - - 15.00 - - - - - 2020-03-20T17:37:20.097+01:00 - uncorrected_temperature - C - 2020-03-20T17:37:20.097+01:00 - - 17.10 - - - - - 2020-03-15T00:49:52.744+01:00 - temperature_offset - C - 2018-12-10T11:33:37.483+01:00 - - 0.00 - - - - - - - 2020-03-20T07:15:11.733+01:00 - thermostat - 15 - 0 - 99.99 - 0.01 - - - - - - 2020-03-15T00:49:52.744+01:00 - temperature_offset - 0 - - - - - Playstation Smart Plug - A smart plug that can be switched on/off and measure power usage. - game_console - 2019-01-29T17:49:50.663+01:00 - 2020-03-20T17:49:05.978+01:00 - - - - - - 2020-03-20T17:40:28.329+01:00 - relay - - 2020-01-16T18:20:20.178+01:00 - - on - - - - - 2020-03-20T17:49:05.974+01:00 - electricity_produced - W - 2019-01-29T17:49:59.292+01:00 - - 0.00 - - - - - 2020-03-20T17:30:00+01:00 - electricity_produced - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T17:49:05.973+01:00 - electricity_consumed - W - 2020-03-20T17:49:05.973+01:00 - - 82.63 - - - - - 2020-03-20T17:30:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 8.60 - - - - - - - 2020-03-20T17:40:28.329+01:00 - false - on - - - - - - CV Pomp - A smart plug that can be switched on/off and measure power usage. - central_heating_pump - 2019-01-14T16:46:50.396+01:00 - 2020-03-20T17:48:21.333+01:00 - - - - - - - - 2020-03-20T17:30:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 7.37 - - - - - 2020-03-20T17:48:21.330+01:00 - electricity_consumed - W - 2020-03-20T17:48:21.330+01:00 - - 35.63 - - - - - 2020-03-20T17:36:13.608+01:00 - relay - - 2020-03-20T12:15:31.336+01:00 - - on - - - - - 2020-03-20T17:48:21.331+01:00 - electricity_produced - W - 2019-01-14T17:23:51.243+01:00 - - 0.00 - - - - - 2020-03-20T17:30:00+01:00 - electricity_produced - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 0.00 - - - - - - - 2020-03-20T17:36:13.608+01:00 - false - on - - - - - - Central heating boiler - - heater_central - 2018-12-10T10:20:01.020+01:00 - 2020-03-20T17:45:03.663+01:00 - - - - - 2020-03-20T17:45:25.755+01:00 - intended_boiler_temperature - C - 2020-03-20T12:15:31.267+01:00 - - 70.00 - - - - - 2020-03-20T12:15:31.288+01:00 - central_heating_state - - 2020-03-20T12:15:31.288+01:00 - - on - - - - - 2020-03-05T15:29:30.361+01:00 - modulation_level - - 2020-03-05T15:29:30.361+01:00 - - 0.01 - - - - - 2019-01-22T18:41:46.115+01:00 - heating_curve_high_setpoint - C - 2019-01-22T18:41:46.115+01:00 - - 70.00 - - - - - 2019-01-22T18:41:45.304+01:00 - heating_curve_low_setpoint - C - 2019-01-22T18:41:45.304+01:00 - - 70.00 - - - - - 2020-03-20T17:34:55.938+01:00 - boiler_temperature - C - 2020-03-20T17:34:55.938+01:00 - - 70.00 - - - - - - intended_central_heating_state - - - - - - 2020-03-20T17:00:00+01:00 - burner_operation_time - s - 2020-03-20T16:00:00+01:00 - PT1H - - 2703 - - - - - 2019-01-22T18:41:44.491+01:00 - heating_curve_high_temperature - C - 2019-01-22T18:41:44.491+01:00 - - 20.00 - - - - - 2019-01-22T18:41:43.681+01:00 - heating_curve_low_temperature - C - 2019-01-22T18:41:43.681+01:00 - - -10.00 - - - - - - - 2019-01-22T18:41:45.305+01:00 - heating_curve_low_setpoint - 70 - 10 - 90 - 1 - - - - - 2019-01-22T18:41:46.116+01:00 - heating_curve_high_setpoint - 70 - 20 - 90 - 1 - - - - - 2019-01-22T18:41:44.492+01:00 - heating_curve_high_temperature - 20 - 10 - 40 - 1 - - - - - 2019-01-22T18:41:43.682+01:00 - heating_curve_low_temperature - -10 - -30 - 10 - 1 - - - - - - - NAS - A smart plug that can be switched on/off and measure power usage. - vcr - 2019-01-21T17:45:53.949+01:00 - 2020-03-20T17:46:49.940+01:00 - - - - - - 2020-03-20T17:46:49.937+01:00 - relay - - 2019-08-24T11:31:08.308+02:00 - - on - - - - - 2020-03-20T17:36:59.253+01:00 - electricity_produced - W - 2019-01-22T18:25:46.592+01:00 - - 0.00 - - - - - 2020-03-20T17:45:00+01:00 - electricity_produced - Wh - 2020-03-20T17:30:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T17:36:59.252+01:00 - electricity_consumed - W - 2020-03-20T17:36:59.252+01:00 - - 16.50 - - - - - 2020-03-20T17:45:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:30:00+01:00 - PT15M - - 0.50 - - - - - - - 2020-03-20T17:46:49.937+01:00 - true - on - - - - - - USG Smart Plug - A smart plug that can be switched on/off and measure power usage. - router - 2019-02-02T18:02:51.584+01:00 - 2020-03-20T17:39:34.219+01:00 - - - - - - 2020-03-20T17:28:23.547+01:00 - electricity_consumed - W - 2020-03-20T13:49:15.729+01:00 - - 8.50 - - - - - 2020-03-20T17:30:00+01:00 - electricity_produced - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T17:39:34.216+01:00 - relay - - 2019-05-08T22:06:24.076+02:00 - - on - - - - - 2020-03-20T17:30:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T17:28:23.547+01:00 - electricity_produced - W - 2019-02-02T18:03:00.262+01:00 - - 0.00 - - - - - - - 2020-03-20T17:39:34.216+01:00 - true - on - - - - - - NVR - A smart plug that can be switched on/off and measure power usage. - vcr - 2019-01-21T17:39:23.813+01:00 - 2020-03-20T17:44:58.716+01:00 - - - - - - 2020-03-20T17:30:00+01:00 - electricity_produced - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T17:30:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 9.15 - - - - - 2020-03-20T17:41:05.161+01:00 - electricity_produced - W - 2019-01-21T17:39:27.592+01:00 - - 0.00 - - - - - 2020-03-20T17:41:05.161+01:00 - electricity_consumed - W - 2020-03-20T17:26:29.884+01:00 - - 34.00 - - - - - 2020-03-20T17:44:58.714+01:00 - relay - - 2019-05-08T13:37:31.544+02:00 - - on - - - - - - - 2020-03-20T17:44:58.714+01:00 - true - on - - - - - - Fibaro HC2 - A smart plug that can be switched on/off and measure power usage. - settop - 2019-01-07T15:49:37.213+01:00 - 2020-03-20T17:43:51.144+01:00 - - - - - - 2020-03-20T17:30:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 3.80 - - - - - 2020-03-20T17:37:18.064+01:00 - electricity_consumed - W - 2020-03-20T17:37:18.064+01:00 - - 12.50 - - - - - 2020-03-20T17:30:00+01:00 - electricity_produced - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T17:37:18.065+01:00 - electricity_produced - W - 2019-01-14T17:23:45.546+01:00 - - 0.00 - - - - - 2020-03-20T17:43:51.141+01:00 - relay - - 2019-05-08T13:37:34.765+02:00 - - on - - - - - - - 2020-03-20T17:43:51.141+01:00 - true - on - - - - - - OpenThermGateway - An OpenTherm Gateway - open_therm_gateway - 2017-08-09T11:55:44.869+02:00 - 2019-01-14T17:23:38.116+01:00 - - - - - 2020-02-10T11:33:41.938+01:00 - open_therm_power_mode - - 2019-01-14T17:23:38.100+01:00 - - 0 - - - - - 2020-03-05T13:57:43.669+01:00 - override_mode - - 2018-10-29T14:06:47.288+01:00 - - on - - - - - - - - Zone Thermostat Jessie - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2019-01-25T17:46:40.150+01:00 - 2020-03-20T17:45:02.580+01:00 - - - - - - 2020-03-20T07:15:06.765+01:00 - thermostat - C - 2020-03-20T07:15:06.701+01:00 - - 15.00 - - - - - 2020-03-20T17:45:02.577+01:00 - temperature - C - 2020-03-20T17:45:02.577+01:00 - - 17.20 - - - - - 2020-03-20T12:02:38.943+01:00 - battery - - 2020-03-09T02:42:32.132+01:00 - - 0.37 - - - - - 2020-02-25T03:23:18.037+01:00 - temperature_offset - C - 2019-03-29T06:14:55.814+01:00 - - 0.00 - - - - - - - - 2020-02-25T03:23:18.037+01:00 - temperature_offset - 0 - - - 2020-03-20T07:15:06.765+01:00 - thermostat - 15 - 0 - 99.9 - 0.01 - - - - - - - Thermostatic Radiator Badkamer - 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 - 2018-12-10T10:52:45.271+01:00 - 2020-03-20T17:48:13.099+01:00 - - - - - - 2020-03-20T17:41:18.604+01:00 - temperature_difference - C - 2020-03-20T15:39:19.313+01:00 - - -0.40 - - - - - 2020-03-20T17:48:13.091+01:00 - uncorrected_temperature - C - 2020-03-20T17:48:13.091+01:00 - - 19.12 - - - - - 2020-03-20T17:48:13.091+01:00 - temperature - C - 2020-03-20T17:48:13.091+01:00 - - 19.12 - - - - - 2020-03-20T08:00:25.110+01:00 - valve_position - - 2020-03-20T08:00:25.110+01:00 - - 0.00 - - - - - 2020-03-20T08:00:13.116+01:00 - thermostat - C - 2020-03-20T08:00:13.116+01:00 - - 14.00 - - - - - 2020-01-30T17:35:08.840+01:00 - temperature_offset - C - 2018-12-10T11:08:44.085+01:00 - - 0.00 - - - - - 2020-03-20T16:25:26.889+01:00 - battery - - 2020-03-18T16:42:15.807+01:00 - - 0.51 - - - - - - - 2020-03-20T08:00:13.117+01:00 - thermostat - 14 - 0 - 99.99 - 0.01 - - - - - - 2020-01-30T17:35:08.840+01:00 - temperature_offset - 0 - - - - - Zone Thermostat Badkamer - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2019-01-25T08:21:56.648+01:00 - 2020-03-20T17:46:28.412+01:00 - - - - - - 2020-01-30T17:40:19.394+01:00 - temperature_offset - C - 2019-05-08T13:55:15.390+02:00 - - 0.00 - - - - - 2020-03-20T16:11:45.745+01:00 - battery - - 2020-03-18T04:23:07.035+01:00 - - 0.92 - - - - - 2020-03-20T17:46:28.409+01:00 - temperature - C - 2020-03-20T17:46:28.409+01:00 - - 18.90 - - - - - 2020-03-20T08:00:04.798+01:00 - thermostat - C - 2020-03-20T08:00:04.751+01:00 - - 14.00 - - - - - - - 2020-03-20T08:00:04.798+01:00 - thermostat - 14 - 0 - 99.9 - 0.01 - - - - - - 2020-01-30T17:40:19.394+01:00 - temperature_offset - 0 - - - - - Ziggo Modem - A smart plug that can be switched on/off and measure power usage. - router - 2019-01-30T08:12:35.240+01:00 - 2020-03-20T17:44:25.553+01:00 - - - - - - 2020-03-20T17:30:00+01:00 - electricity_produced - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T17:44:25.550+01:00 - relay - - 2019-05-08T13:36:33.221+02:00 - - on - - - - - 2020-03-20T17:30:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 2.97 - - - - - 2020-03-20T17:30:28.366+01:00 - electricity_produced - W - 2019-01-30T08:12:42.877+01:00 - - 0.00 - - - - - 2020-03-20T17:30:28.366+01:00 - electricity_consumed - W - 2020-03-20T14:05:41.152+01:00 - - 12.19 - - - - - - - 2020-03-20T17:44:25.550+01:00 - true - on - - - - - - CV Kraan Garage - 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 - 2019-01-21T19:14:50.095+01:00 - 2020-03-20T17:42:30.582+01:00 - - - - - - 2020-03-20T07:41:32.962+01:00 - battery - - 2020-03-16T19:28:48.366+01:00 - - 0.68 - - - - - 2020-03-20T17:09:08.120+01:00 - temperature_difference - C - 2020-03-20T17:09:08.120+01:00 - - 0.00 - - - - - 2020-03-20T17:42:30.578+01:00 - uncorrected_temperature - C - 2020-03-20T17:27:58.612+01:00 - - 15.60 - - - - - 2020-03-20T17:42:30.577+01:00 - temperature - C - 2020-03-20T17:42:30.577+01:00 - - 15.60 - - - - - 2020-03-20T07:50:13.375+01:00 - valve_position - - 2020-02-12T17:56:25.782+01:00 - - 0.00 - - - - - 2020-02-09T17:38:19.642+01:00 - temperature_offset - C - 2019-01-21T19:15:08.042+01:00 - - 0.00 - - - - - 2020-02-23T13:50:45.747+01:00 - thermostat - C - 2020-02-23T13:50:45.747+01:00 - - 5.50 - - - - - - - 2020-02-23T13:50:45.748+01:00 - thermostat - 5.5 - 0 - 99.99 - 0.01 - - - - - - 2020-02-09T17:38:19.642+01:00 - temperature_offset - 0 - - - - diff --git a/userdata/adam_multiple_devices_per_zone/core.direct_objects.xml b/userdata/adam_multiple_devices_per_zone/core.direct_objects.xml deleted file mode 100644 index bb1a135d7..000000000 --- a/userdata/adam_multiple_devices_per_zone/core.direct_objects.xml +++ /dev/null @@ -1,2014 +0,0 @@ - - - - Zone Lisa Bios - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2019-01-24T20:55:13.905+01:00 - 2020-03-20T17:40:49.475+01:00 - - - - - - 2020-03-20T17:40:49.470+01:00 - temperature - C - 2020-03-20T17:40:49.470+01:00 - - 16.50 - - - - - 2020-03-20T07:40:13.803+01:00 - battery - - 2020-03-15T19:54:42.318+01:00 - - 0.67 - - - - - 2020-03-20T08:22:10.252+01:00 - thermostat - C - 2020-03-19T08:25:49.033+01:00 - - 13.00 - - - - - 2020-01-30T17:35:06.817+01:00 - temperature_offset - C - 2019-01-24T20:55:28.943+01:00 - - 0.00 - - - - - - - 2020-03-20T08:22:10.252+01:00 - thermostat - 13 - 0 - 99.9 - 0.01 - - - - - - 2020-01-30T17:35:06.817+01:00 - temperature_offset - 0 - - - - - Floor kraan - 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 - 2019-01-14T16:45:47.777+01:00 - 2020-03-20T17:45:33.522+01:00 - - - - - - 2020-03-20T12:15:29.245+01:00 - valve_position - - 2020-03-20T12:15:29.245+01:00 - - 1.00 - - - - - 2020-03-20T17:45:33.518+01:00 - temperature_difference - C - 2020-03-20T17:45:33.518+01:00 - - 3.50 - - - - - 2020-03-20T17:38:32.488+01:00 - uncorrected_temperature - C - 2020-03-20T17:38:32.488+01:00 - - 25.85 - - - - - 2020-03-20T08:55:08.044+01:00 - thermostat - C - 2020-03-20T08:55:08.044+01:00 - - 21.50 - - - - - 2020-03-20T17:38:32.488+01:00 - temperature - C - 2020-03-20T17:38:32.488+01:00 - - 26.04 - - - - - 2019-12-24T21:47:20.951+01:00 - temperature_offset - C - 2019-01-14T16:45:58.634+01:00 - - 0.00 - - - - - - - - 2019-12-24T21:47:20.951+01:00 - temperature_offset - 0 - - - 2020-03-20T08:55:08.045+01:00 - thermostat - 21.5 - 0 - 99.99 - 0.01 - - - - - - - Bios Cv Thermostatic Radiator - 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 - 2019-01-24T20:53:13.633+01:00 - 2020-03-20T17:39:08.025+01:00 - - - - - - 2020-03-20T17:39:08.019+01:00 - uncorrected_temperature - C - 2020-03-20T17:24:43.135+01:00 - - 17.16 - - - - - 2020-02-16T18:48:56.608+01:00 - temperature_offset - C - 2019-01-24T20:53:33.959+01:00 - - 0.00 - - - - - 2020-03-20T17:13:33.141+01:00 - temperature_difference - C - 2020-03-20T14:40:16.878+01:00 - - -0.20 - - - - - 2020-03-20T17:39:08.018+01:00 - temperature - C - 2020-03-20T17:39:08.018+01:00 - - 17.16 - - - - - 2020-03-19T08:26:41.317+01:00 - thermostat - C - 2020-03-19T08:26:35.396+01:00 - - 13.00 - - - - - 2020-03-20T12:02:21.727+01:00 - valve_position - - 2020-03-15T00:48:58.016+01:00 - - 0.00 - - - - - 2020-03-20T14:21:55.399+01:00 - battery - - 2020-03-18T14:39:05.500+01:00 - - 0.62 - - - - - - - - 2020-02-16T18:48:56.608+01:00 - temperature_offset - 0 - - - 2020-03-19T08:26:41.317+01:00 - thermostat - 13 - 0 - 99.99 - 0.01 - - - - - - - Kantoor - - office - 2019-01-19T22:52:14.254+01:00 - 2019-01-30T09:05:45.161+01:00 - - home - - - - - 2019-01-30T08:24:56.135+01:00 - electricity_consumed - W - 2019-01-24T19:36:05.052+01:00 - - 12.69 - - - - - electricity_produced - W - - - - - - - Zone Lisa WK - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2019-01-14T16:59:21.855+01:00 - 2020-03-20T17:44:59.632+01:00 - - - - - - - - 2020-03-20T17:44:59.628+01:00 - temperature - C - 2020-03-20T17:44:59.628+01:00 - - 20.90 - - - - - 2020-03-20T08:55:11.798+01:00 - thermostat - C - 2020-03-20T08:55:11.706+01:00 - - 21.50 - - - - - 2020-03-20T15:51:12.192+01:00 - battery - - 2020-03-18T16:12:33.910+01:00 - - 0.34 - - - - - 2020-01-30T17:35:25.361+01:00 - temperature_offset - C - 2019-01-14T17:00:05.062+01:00 - - 0.00 - - - - - - - - 2020-01-30T17:35:25.361+01:00 - temperature_offset - 0 - - - 2020-03-20T08:55:11.798+01:00 - thermostat - 21.5 - 0 - 99.9 - 0.01 - - - - - - - Gateway D40FB201C949 - Container for variables logged about the Gateway in general. - gateway - 2018-10-29T14:06:47.624+01:00 - 2020-03-20T16:44:31.571+01:00 - - - - - 2020-03-20T16:44:31.526+01:00 - wlan_ip_address - - 2020-02-20T10:40:44+01:00 - - 127.0.0.1 - - - - - 2020-03-20T16:44:31.525+01:00 - signal_strength - dBm - 2020-03-20T16:44:31.525+01:00 - - -32.00 - - - - - 2020-03-20T16:44:30.528+01:00 - lan_state - - 2018-10-29T14:08:05.107+01:00 - - down - - - - - 2020-03-20T16:44:31.526+01:00 - wlan_state - - 2020-02-19T21:33:48.007+01:00 - - up - - - - - 2020-01-15T15:41:43.957+01:00 - regulation_mode - - - - heating - - - - - 2020-03-20T16:44:31.526+01:00 - link_quality - - 2020-03-20T00:39:40.480+01:00 - - 70 - - - - - - - - 2020-01-15T15:41:43.957+01:00 - regulation_mode - heating - - - - - Vloerverwarming Woonkamer - - pumping - 2019-01-14T17:29:28.174+01:00 - 2020-03-20T17:48:21.360+01:00 - - - - - - - - 2020-03-20T17:44:59.628+01:00 - temperature - C - 2020-03-05T14:56:37.615+01:00 - - 20.90 - - - - - electricity_produced - W - - - - 2020-03-20T17:48:21.330+01:00 - electricity_consumed - W - 2020-03-05T15:01:16.100+01:00 - - 35.63 - - - - - - - false - single - - - - - Thermostatic Radiator Jessie - 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 - 2018-12-10T11:32:43.255+01:00 - 2020-03-20T17:37:20.104+01:00 - - - - - - 2020-03-20T17:06:16.944+01:00 - valve_position - - 2020-03-14T06:00:28.153+01:00 - - 0.00 - - - - - 2020-03-20T17:29:36.884+01:00 - temperature_difference - C - 2020-03-20T17:29:36.884+01:00 - - 0.10 - - - - - 2020-03-20T15:03:58.067+01:00 - battery - - 2020-03-20T15:03:58.067+01:00 - - 0.62 - - - - - 2020-03-20T17:37:20.097+01:00 - temperature - C - 2020-03-20T17:37:20.097+01:00 - - 17.10 - - - - - 2020-03-20T07:15:11.732+01:00 - thermostat - C - 2020-03-20T07:15:11.732+01:00 - - 15.00 - - - - - 2020-03-20T17:37:20.097+01:00 - uncorrected_temperature - C - 2020-03-20T17:37:20.097+01:00 - - 17.10 - - - - - 2020-03-15T00:49:52.744+01:00 - temperature_offset - C - 2018-12-10T11:33:37.483+01:00 - - 0.00 - - - - - - - 2020-03-20T07:15:11.733+01:00 - thermostat - 15 - 0 - 99.99 - 0.01 - - - - - - 2020-03-15T00:49:52.744+01:00 - temperature_offset - 0 - - - - - Systeem - - system - 2019-01-30T09:03:27.262+01:00 - 2020-03-20T17:50:56.772+01:00 - - home - - - - - - - - - - - - - relay - - - - - 2020-03-20T17:50:56.747+01:00 - electricity_consumed - W - 2020-03-05T14:56:20.273+01:00 - - 110.69 - - - - 2019-02-02T18:03:46.127+01:00 - electricity_produced - W - - - 0.00 - - - - - - - false - single - - - - - Playstation Smart Plug - A smart plug that can be switched on/off and measure power usage. - game_console - 2019-01-29T17:49:50.663+01:00 - 2020-03-20T17:50:56.752+01:00 - - - - - - 2020-03-20T17:40:28.329+01:00 - relay - - 2020-01-16T18:20:20.178+01:00 - - on - - - - - 2020-03-20T17:50:56.748+01:00 - electricity_produced - W - 2019-01-29T17:49:59.292+01:00 - - 0.00 - - - - - 2020-03-20T17:30:00+01:00 - electricity_produced - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T17:50:56.747+01:00 - electricity_consumed - W - 2020-03-20T17:50:56.747+01:00 - - 81.69 - - - - - 2020-03-20T17:30:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 8.60 - - - - - - - 2020-03-20T17:40:28.329+01:00 - false - on - - - - - - CV Kraan Garage - 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 - 2019-01-21T19:14:50.095+01:00 - 2020-03-20T17:42:30.582+01:00 - - - - - - 2020-03-20T07:41:32.962+01:00 - battery - - 2020-03-16T19:28:48.366+01:00 - - 0.68 - - - - - 2020-03-20T17:09:08.120+01:00 - temperature_difference - C - 2020-03-20T17:09:08.120+01:00 - - 0.00 - - - - - 2020-03-20T17:42:30.578+01:00 - uncorrected_temperature - C - 2020-03-20T17:27:58.612+01:00 - - 15.60 - - - - - 2020-03-20T17:42:30.577+01:00 - temperature - C - 2020-03-20T17:42:30.577+01:00 - - 15.60 - - - - - 2020-03-20T07:50:13.375+01:00 - valve_position - - 2020-02-12T17:56:25.782+01:00 - - 0.00 - - - - - 2020-02-09T17:38:19.642+01:00 - temperature_offset - C - 2019-01-21T19:15:08.042+01:00 - - 0.00 - - - - - 2020-02-23T13:50:45.747+01:00 - thermostat - C - 2020-02-23T13:50:45.747+01:00 - - 5.50 - - - - - - - 2020-02-23T13:50:45.748+01:00 - thermostat - 5.5 - 0 - 99.99 - 0.01 - - - - - - 2020-02-09T17:38:19.642+01:00 - temperature_offset - 0 - - - - - Home - - building - 2018-10-29T14:06:43.134+01:00 - 2020-03-20T17:45:02.574+01:00 - - home - - - - - 2020-03-20T17:45:00+01:00 - wind_vector - m_s - 2020-03-20T17:45:00+01:00 - - (8.20,40.00) - - - - - 2020-03-20T17:45:00+01:00 - outdoor_temperature - C - 2020-03-20T17:45:00+01:00 - - 7.81 - - - - - 2020-03-20T17:45:00+01:00 - solar_irradiance - W_m2 - 2020-03-20T17:45:00+01:00 - - 157.50 - - - - - 2020-03-20T17:45:00+01:00 - humidity - RH - 2020-03-20T17:45:00+01:00 - - 75.00 - - - - - 2020-03-20T17:45:00+01:00 - weather_description - - 2020-03-20T17:45:00+01:00 - - cloudy - - - - - - - - Badkamer - - bathroom - 2019-01-17T23:41:52.135+01:00 - 2020-03-20T17:46:28.421+01:00 - - away - - - - - - - - 2020-03-20T08:00:04.751+01:00 - thermostat - C - 2020-03-03T12:30:54.244+01:00 - - 14.00 - - - - 2020-03-20T17:46:28.409+01:00 - temperature - C - 2020-03-05T15:08:12.371+01:00 - - 18.90 - - - - - - 2020-03-20T08:00:02.888+01:00 - thermostat - 14 - 0 - 99.99 - 0.01 - - false - true - - - - - CV Pomp - A smart plug that can be switched on/off and measure power usage. - central_heating_pump - 2019-01-14T16:46:50.396+01:00 - 2020-03-20T17:50:48.306+01:00 - - - - - - - - 2020-03-20T17:30:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 7.37 - - - - - 2020-03-20T17:48:21.330+01:00 - electricity_consumed - W - 2020-03-20T17:48:21.330+01:00 - - 35.63 - - - - - 2020-03-20T17:50:48.303+01:00 - relay - - 2020-03-20T12:15:31.336+01:00 - - on - - - - - 2020-03-20T17:48:21.331+01:00 - electricity_produced - W - 2019-01-14T17:23:51.243+01:00 - - 0.00 - - - - - 2020-03-20T17:30:00+01:00 - electricity_produced - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 0.00 - - - - - - - 2020-03-20T17:50:48.303+01:00 - false - on - - - - - - Central heating boiler - - heater_central - 2018-12-10T10:20:01.020+01:00 - 2020-03-20T17:50:04.518+01:00 - - - - - 2020-03-20T17:49:25.789+01:00 - intended_boiler_temperature - C - 2020-03-20T12:15:31.267+01:00 - - 70.00 - - - - - 2020-03-20T12:15:31.288+01:00 - central_heating_state - - 2020-03-20T12:15:31.288+01:00 - - on - - - - - 2020-03-05T15:29:30.361+01:00 - modulation_level - - 2020-03-05T15:29:30.361+01:00 - - 0.01 - - - - - 2019-01-22T18:41:46.115+01:00 - heating_curve_high_setpoint - C - 2019-01-22T18:41:46.115+01:00 - - 70.00 - - - - - 2019-01-22T18:41:45.304+01:00 - heating_curve_low_setpoint - C - 2019-01-22T18:41:45.304+01:00 - - 70.00 - - - - - 2020-03-20T17:34:55.938+01:00 - boiler_temperature - C - 2020-03-20T17:34:55.938+01:00 - - 70.00 - - - - - - intended_central_heating_state - - - - - - 2020-03-20T17:00:00+01:00 - burner_operation_time - s - 2020-03-20T16:00:00+01:00 - PT1H - - 3004 - - - - - 2019-01-22T18:41:44.491+01:00 - heating_curve_high_temperature - C - 2019-01-22T18:41:44.491+01:00 - - 20.00 - - - - - 2019-01-22T18:41:43.681+01:00 - heating_curve_low_temperature - C - 2019-01-22T18:41:43.681+01:00 - - -10.00 - - - - - - - 2019-01-22T18:41:45.305+01:00 - heating_curve_low_setpoint - 70 - 10 - 90 - 1 - - - - - 2019-01-22T18:41:46.116+01:00 - heating_curve_high_setpoint - 70 - 20 - 90 - 1 - - - - - 2019-01-22T18:41:44.492+01:00 - heating_curve_high_temperature - 20 - 10 - 40 - 1 - - - - - 2019-01-22T18:41:43.682+01:00 - heating_curve_low_temperature - -10 - -30 - 10 - 1 - - - - - - - NAS - A smart plug that can be switched on/off and measure power usage. - vcr - 2019-01-21T17:45:53.949+01:00 - 2020-03-20T17:46:49.940+01:00 - - - - - - 2020-03-20T17:46:49.937+01:00 - relay - - 2019-08-24T11:31:08.308+02:00 - - on - - - - - 2020-03-20T17:36:59.253+01:00 - electricity_produced - W - 2019-01-22T18:25:46.592+01:00 - - 0.00 - - - - - 2020-03-20T17:45:00+01:00 - electricity_produced - Wh - 2020-03-20T17:30:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T17:36:59.252+01:00 - electricity_consumed - W - 2020-03-20T17:36:59.252+01:00 - - 16.50 - - - - - 2020-03-20T17:45:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:30:00+01:00 - PT15M - - 0.50 - - - - - - - 2020-03-20T17:46:49.937+01:00 - true - on - - - - - - USG Smart Plug - A smart plug that can be switched on/off and measure power usage. - router - 2019-02-02T18:02:51.584+01:00 - 2020-03-20T17:39:34.219+01:00 - - - - - - 2020-03-20T17:28:23.547+01:00 - electricity_consumed - W - 2020-03-20T13:49:15.729+01:00 - - 8.50 - - - - - 2020-03-20T17:30:00+01:00 - electricity_produced - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T17:39:34.216+01:00 - relay - - 2019-05-08T22:06:24.076+02:00 - - on - - - - - 2020-03-20T17:30:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T17:28:23.547+01:00 - electricity_produced - W - 2019-02-02T18:03:00.262+01:00 - - 0.00 - - - - - - - 2020-03-20T17:39:34.216+01:00 - true - on - - - - - - Garage - - garage - 2020-02-09T17:35:30.305+01:00 - 2020-03-20T17:42:30.592+01:00 - - no_frost - - - - - - - 2020-03-20T17:42:30.577+01:00 - temperature - C - 2020-03-05T15:05:44.130+01:00 - - 15.60 - - - - 2020-02-23T13:50:45.747+01:00 - thermostat - C - 2020-02-09T17:36:24.831+01:00 - - 5.50 - - - - - - 2020-02-23T13:50:45.748+01:00 - thermostat - 5.5 - 0 - 99.99 - 0.01 - - false - true - - - - - NVR - A smart plug that can be switched on/off and measure power usage. - vcr - 2019-01-21T17:39:23.813+01:00 - 2020-03-20T17:44:58.716+01:00 - - - - - - 2020-03-20T17:30:00+01:00 - electricity_produced - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T17:30:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 9.15 - - - - - 2020-03-20T17:41:05.161+01:00 - electricity_produced - W - 2019-01-21T17:39:27.592+01:00 - - 0.00 - - - - - 2020-03-20T17:41:05.161+01:00 - electricity_consumed - W - 2020-03-20T17:26:29.884+01:00 - - 34.00 - - - - - 2020-03-20T17:44:58.714+01:00 - relay - - 2019-05-08T13:37:31.544+02:00 - - on - - - - - - - 2020-03-20T17:44:58.714+01:00 - true - on - - - - - - Fibaro HC2 - A smart plug that can be switched on/off and measure power usage. - settop - 2019-01-07T15:49:37.213+01:00 - 2020-03-20T17:43:51.144+01:00 - - - - - - 2020-03-20T17:30:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 3.80 - - - - - 2020-03-20T17:37:18.064+01:00 - electricity_consumed - W - 2020-03-20T17:37:18.064+01:00 - - 12.50 - - - - - 2020-03-20T17:30:00+01:00 - electricity_produced - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T17:37:18.065+01:00 - electricity_produced - W - 2019-01-14T17:23:45.546+01:00 - - 0.00 - - - - - 2020-03-20T17:43:51.141+01:00 - relay - - 2019-05-08T13:37:34.765+02:00 - - on - - - - - - - 2020-03-20T17:43:51.141+01:00 - true - on - - - - - - OpenThermGateway - An OpenTherm Gateway - open_therm_gateway - 2017-08-09T11:55:44.869+02:00 - 2019-01-14T17:23:38.116+01:00 - - - - - 2020-02-10T11:33:41.938+01:00 - open_therm_power_mode - - 2019-01-14T17:23:38.100+01:00 - - 0 - - - - - 2020-03-05T13:57:43.669+01:00 - override_mode - - 2018-10-29T14:06:47.288+01:00 - - on - - - - - - - - Zone Thermostat Jessie - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2019-01-25T17:46:40.150+01:00 - 2020-03-20T17:45:02.580+01:00 - - - - - - 2020-03-20T07:15:06.765+01:00 - thermostat - C - 2020-03-20T07:15:06.701+01:00 - - 15.00 - - - - - 2020-03-20T17:45:02.577+01:00 - temperature - C - 2020-03-20T17:45:02.577+01:00 - - 17.20 - - - - - 2020-03-20T12:02:38.943+01:00 - battery - - 2020-03-09T02:42:32.132+01:00 - - 0.37 - - - - - 2020-02-25T03:23:18.037+01:00 - temperature_offset - C - 2019-03-29T06:14:55.814+01:00 - - 0.00 - - - - - - - - 2020-02-25T03:23:18.037+01:00 - temperature_offset - 0 - - - 2020-03-20T07:15:06.765+01:00 - thermostat - 15 - 0 - 99.9 - 0.01 - - - - - - - Jessie - - bedroom - 2019-01-25T17:08:54.204+01:00 - 2020-03-20T17:45:02.592+01:00 - - asleep - - - - - - - - 2020-03-20T07:15:06.701+01:00 - thermostat - C - 2020-03-05T07:15:05.786+01:00 - - 15.00 - - - - 2020-03-20T17:45:02.577+01:00 - temperature - C - 2020-03-05T15:06:28.158+01:00 - - 17.20 - - - - - - 2020-02-26T20:50:39.376+01:00 - thermostat - 15 - 0 - 99.99 - 0.01 - - false - true - - - - - Bios - - guestroom - 2019-01-20T23:31:20.177+01:00 - 2020-03-20T17:40:49.490+01:00 - - away - - - - - - - - 2020-03-20T17:40:49.470+01:00 - temperature - C - 2020-03-05T15:07:18.483+01:00 - - 16.50 - - - - 2019-01-22T18:25:46.592+01:00 - electricity_produced - W - 2019-01-21T17:46:31.092+01:00 - - 0.00 - - - - 2019-01-30T09:04:56.705+01:00 - electricity_consumed - W - 2019-01-24T19:46:34.423+01:00 - - 0.00 - - - - 2020-03-19T08:25:49.033+01:00 - thermostat - C - 2020-03-02T23:06:16.280+01:00 - - 13.00 - - - - - - 2020-03-19T08:25:47.853+01:00 - thermostat - 13 - 0 - 99.99 - 0.01 - - false - true - - - - - Thermostatic Radiator Badkamer - 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 - 2018-12-10T10:52:45.271+01:00 - 2020-03-20T17:48:13.099+01:00 - - - - - - 2020-03-20T17:41:18.604+01:00 - temperature_difference - C - 2020-03-20T15:39:19.313+01:00 - - -0.40 - - - - - 2020-03-20T17:48:13.091+01:00 - uncorrected_temperature - C - 2020-03-20T17:48:13.091+01:00 - - 19.12 - - - - - 2020-03-20T17:48:13.091+01:00 - temperature - C - 2020-03-20T17:48:13.091+01:00 - - 19.12 - - - - - 2020-03-20T08:00:25.110+01:00 - valve_position - - 2020-03-20T08:00:25.110+01:00 - - 0.00 - - - - - 2020-03-20T08:00:13.116+01:00 - thermostat - C - 2020-03-20T08:00:13.116+01:00 - - 14.00 - - - - - 2020-01-30T17:35:08.840+01:00 - temperature_offset - C - 2018-12-10T11:08:44.085+01:00 - - 0.00 - - - - - 2020-03-20T16:25:26.889+01:00 - battery - - 2020-03-18T16:42:15.807+01:00 - - 0.51 - - - - - - - 2020-03-20T08:00:13.117+01:00 - thermostat - 14 - 0 - 99.99 - 0.01 - - - - - - 2020-01-30T17:35:08.840+01:00 - temperature_offset - 0 - - - - - Zone Thermostat Badkamer - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2019-01-25T08:21:56.648+01:00 - 2020-03-20T17:46:28.412+01:00 - - - - - - 2020-01-30T17:40:19.394+01:00 - temperature_offset - C - 2019-05-08T13:55:15.390+02:00 - - 0.00 - - - - - 2020-03-20T16:11:45.745+01:00 - battery - - 2020-03-18T04:23:07.035+01:00 - - 0.92 - - - - - 2020-03-20T17:46:28.409+01:00 - temperature - C - 2020-03-20T17:46:28.409+01:00 - - 18.90 - - - - - 2020-03-20T08:00:04.798+01:00 - thermostat - C - 2020-03-20T08:00:04.751+01:00 - - 14.00 - - - - - - - 2020-03-20T08:00:04.798+01:00 - thermostat - 14 - 0 - 99.9 - 0.01 - - - - - - 2020-01-30T17:40:19.394+01:00 - temperature_offset - 0 - - - - - Ziggo Modem - A smart plug that can be switched on/off and measure power usage. - router - 2019-01-30T08:12:35.240+01:00 - 2020-03-20T17:44:25.553+01:00 - - - - - - 2020-03-20T17:30:00+01:00 - electricity_produced - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T17:44:25.550+01:00 - relay - - 2019-05-08T13:36:33.221+02:00 - - on - - - - - 2020-03-20T17:30:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:15:00+01:00 - PT15M - - 2.97 - - - - - 2020-03-20T17:30:28.366+01:00 - electricity_produced - W - 2019-01-30T08:12:42.877+01:00 - - 0.00 - - - - - 2020-03-20T17:30:28.366+01:00 - electricity_consumed - W - 2020-03-20T14:05:41.152+01:00 - - 12.19 - - - - - - - 2020-03-20T17:44:25.550+01:00 - true - on - - - - - - Woonkamer - - livingroom - 2019-01-14T16:45:34.964+01:00 - 2020-03-20T17:48:21.345+01:00 - - home - - - - - - - - - 2020-03-20T08:55:11.706+01:00 - thermostat - C - 2020-03-05T15:00:07.102+01:00 - - 21.50 - - - - - relay - - - - - 2020-03-20T17:48:21.330+01:00 - electricity_consumed - W - 2020-03-05T15:01:16.100+01:00 - - 35.63 - - - - 2019-07-08T18:07:07.272+02:00 - electricity_produced - W - 2019-04-08T17:43:57.736+02:00 - - 0.00 - - - - 2020-03-20T17:44:59.628+01:00 - temperature - C - 2020-03-05T14:56:37.615+01:00 - - 20.90 - - - - - - - false - single - - - 2020-03-20T08:55:06.281+01:00 - thermostat - 21.5 - 0 - 99.99 - 0.01 - - false - true - - - - diff --git a/userdata/adam_multiple_devices_per_zone/core.locations.xml b/userdata/adam_multiple_devices_per_zone/core.locations.xml deleted file mode 100644 index f8861b08d..000000000 --- a/userdata/adam_multiple_devices_per_zone/core.locations.xml +++ /dev/null @@ -1,429 +0,0 @@ - - - - Jessie - - bedroom - 2019-01-25T17:08:54.204+01:00 - 2020-03-20T17:45:02.592+01:00 - - asleep - - - - - - - - 2020-03-20T07:15:06.701+01:00 - thermostat - C - 2020-03-05T07:15:05.786+01:00 - - 15.00 - - - - 2020-03-20T17:45:02.577+01:00 - temperature - C - 2020-03-05T15:06:28.158+01:00 - - 17.20 - - - - - - 2020-02-26T20:50:39.376+01:00 - thermostat - 15 - 0 - 99.99 - 0.01 - - false - true - - - - - Kantoor - - office - 2019-01-19T22:52:14.254+01:00 - 2019-01-30T09:05:45.161+01:00 - - home - - - - - 2019-01-30T08:24:56.135+01:00 - electricity_consumed - W - 2019-01-24T19:36:05.052+01:00 - - 12.69 - - - - - electricity_produced - W - - - - - - - Garage - - garage - 2020-02-09T17:35:30.305+01:00 - 2020-03-20T17:42:30.592+01:00 - - no_frost - - - - - - - 2020-03-20T17:42:30.577+01:00 - temperature - C - 2020-03-05T15:05:44.130+01:00 - - 15.60 - - - - 2020-02-23T13:50:45.747+01:00 - thermostat - C - 2020-02-09T17:36:24.831+01:00 - - 5.50 - - - - - - 2020-02-23T13:50:45.748+01:00 - thermostat - 5.5 - 0 - 99.99 - 0.01 - - false - true - - - - - Systeem - - system - 2019-01-30T09:03:27.262+01:00 - 2020-03-20T17:50:06.410+01:00 - - home - - - - - - - - - - - - - relay - - - - - 2020-03-20T17:50:06.390+01:00 - electricity_consumed - W - 2020-03-05T14:56:20.273+01:00 - - 109.50 - - - - 2019-02-02T18:03:46.127+01:00 - electricity_produced - W - - - 0.00 - - - - - - - false - single - - - - - Bios - - guestroom - 2019-01-20T23:31:20.177+01:00 - 2020-03-20T17:40:49.490+01:00 - - away - - - - - - - - 2020-03-20T17:40:49.470+01:00 - temperature - C - 2020-03-05T15:07:18.483+01:00 - - 16.50 - - - - 2019-01-22T18:25:46.592+01:00 - electricity_produced - W - 2019-01-21T17:46:31.092+01:00 - - 0.00 - - - - 2019-01-30T09:04:56.705+01:00 - electricity_consumed - W - 2019-01-24T19:46:34.423+01:00 - - 0.00 - - - - 2020-03-19T08:25:49.033+01:00 - thermostat - C - 2020-03-02T23:06:16.280+01:00 - - 13.00 - - - - - - 2020-03-19T08:25:47.853+01:00 - thermostat - 13 - 0 - 99.99 - 0.01 - - false - true - - - - - Woonkamer - - livingroom - 2019-01-14T16:45:34.964+01:00 - 2020-03-20T17:48:21.345+01:00 - - home - - - - - - - - - 2020-03-20T08:55:11.706+01:00 - thermostat - C - 2020-03-05T15:00:07.102+01:00 - - 21.50 - - - - - relay - - - - - 2020-03-20T17:48:21.330+01:00 - electricity_consumed - W - 2020-03-05T15:01:16.100+01:00 - - 35.63 - - - - 2019-07-08T18:07:07.272+02:00 - electricity_produced - W - 2019-04-08T17:43:57.736+02:00 - - 0.00 - - - - 2020-03-20T17:44:59.628+01:00 - temperature - C - 2020-03-05T14:56:37.615+01:00 - - 20.90 - - - - - - - false - single - - - 2020-03-20T08:55:06.281+01:00 - thermostat - 21.5 - 0 - 99.99 - 0.01 - - false - true - - - - - Badkamer - - bathroom - 2019-01-17T23:41:52.135+01:00 - 2020-03-20T17:46:28.421+01:00 - - away - - - - - - - - 2020-03-20T08:00:04.751+01:00 - thermostat - C - 2020-03-03T12:30:54.244+01:00 - - 14.00 - - - - 2020-03-20T17:46:28.409+01:00 - temperature - C - 2020-03-05T15:08:12.371+01:00 - - 18.90 - - - - - - 2020-03-20T08:00:02.888+01:00 - thermostat - 14 - 0 - 99.99 - 0.01 - - false - true - - - - - Home - - building - 2018-10-29T14:06:43.134+01:00 - 2020-03-20T17:45:02.574+01:00 - - home - - - - - 2020-03-20T17:45:00+01:00 - wind_vector - m_s - 2020-03-20T17:45:00+01:00 - - (8.20,40.00) - - - - - 2020-03-20T17:45:00+01:00 - outdoor_temperature - C - 2020-03-20T17:45:00+01:00 - - 7.81 - - - - - 2020-03-20T17:45:00+01:00 - solar_irradiance - W_m2 - 2020-03-20T17:45:00+01:00 - - 157.50 - - - - - 2020-03-20T17:45:00+01:00 - humidity - RH - 2020-03-20T17:45:00+01:00 - - 75.00 - - - - - 2020-03-20T17:45:00+01:00 - weather_description - - 2020-03-20T17:45:00+01:00 - - cloudy - - - - - - - diff --git a/userdata/adam_multiple_devices_per_zone/core.modules.xml b/userdata/adam_multiple_devices_per_zone/core.modules.xml deleted file mode 100644 index 2f2f6c359..000000000 --- a/userdata/adam_multiple_devices_per_zone/core.modules.xml +++ /dev/null @@ -1,746 +0,0 @@ - - - - Plugwise - 158-01 - 255 - 2016-10-27T02:00:00+02:00 - 2019-01-25T17:46:39.267+01:00 - 2019-01-25T17:53:34.957+01:00 - - - - - - - - - - - - - - - - - - ABCD012345670A03 - end_device - true - battery - - - - - - - Plugwise - 106-03 - 1 - 2019-03-27T01:00:00+01:00 - 2019-01-23T18:55:54.552+01:00 - 2020-01-15T15:43:07.112+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - ABCD012345670A09 - end_device - true - battery - - - - - - - Plugwise - Gateway - AME Smile 2.0 board - - 2018-10-29T14:06:41.297+01:00 - 2020-01-15T15:41:42.938+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - 160-01 - - 2016-12-01T01:00:00+01:00 - 2019-01-07T15:49:36.790+01:00 - 2020-01-15T18:06:52.761+01:00 - - - - - - - - - ABCD012345670A04 - router - false - mains - - - - - - - Plugwise - 106-03 - 1 - 2019-03-27T01:00:00+01:00 - 2018-12-10T11:32:41.282+01:00 - 2020-01-15T15:42:34.628+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - ABCD012345670A10 - end_device - true - battery - - - - - - - - 159.1 - - - 2017-08-09T11:55:57.154+02:00 - 2018-10-29T14:06:59.466+01:00 - - - - - 0.0 - - - - - - Plugwise - 160-01 - - 2019-06-21T02:00:00+02:00 - 2019-01-21T17:45:53.497+01:00 - 2020-01-15T16:40:16.140+01:00 - - - - - - - - - - - - - - - ABCD012345670A14 - router - true - mains - - - - - - - Plugwise - 160-01 - - 2019-06-21T02:00:00+02:00 - 2019-01-14T16:46:49.917+01:00 - 2020-01-15T16:16:01.164+01:00 - - - - - - - - - - - - - - - ABCD012345670A05 - router - true - mains - - - - - - - - - - - 2018-10-29T14:06:42.721+01:00 - 2020-01-15T15:43:09.591+01:00 - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - 106-03 - 1 - 2019-03-27T01:00:00+01:00 - 2019-01-21T19:14:49.122+01:00 - 2020-02-09T17:35:41.864+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - ABCD012345670A11 - end_device - true - battery - - - - - - - Plugwise - 160-01 - - 2019-06-21T02:00:00+02:00 - 2019-02-02T18:02:50.749+01:00 - 2020-01-15T16:23:31.154+01:00 - - - - - - - - - - - - - - - ABCD012345670A16 - router - true - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-27T02:00:00+02:00 - 2019-01-23T20:12:00.726+01:00 - 2020-02-10T11:34:23.484+01:00 - - - - - - - - - - - - - - - - - - ABCD012345670A06 - end_device - true - battery - - - - - - - - - - - 2018-12-10T10:19:57.378+01:00 - 2020-01-15T15:41:43.917+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - 106-03 - 1 - 2019-03-27T01:00:00+01:00 - 2019-01-14T16:45:47.254+01:00 - 2020-01-15T15:42:41.152+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - ABCD012345670A02 - router - true - mains - - - - - - - Plugwise - 160-01 - - 2019-06-21T02:00:00+02:00 - 2019-01-29T17:49:50.327+01:00 - 2020-01-15T15:59:49.050+01:00 - - - - - - - - - - - - - - - ABCD012345670A12 - router - true - mains - - - - - - - Plugwise - 160-01 - - 2019-06-21T02:00:00+02:00 - 2019-01-07T15:49:36.217+01:00 - 2020-01-15T16:31:40.849+01:00 - - - - - - - - - - - - - - - ABCD012345670A13 - router - true - mains - - - - - - - Plugwise - Adam - 6539-1601-4502 - 2018-10-30T10:12:41+01:00 - 2017-08-09T11:55:44.017+02:00 - 2019-01-14T17:24:37.209+01:00 - - - - - - - - - - - - 17-11-001-948 - - - - - - - Plugwise - 106-03 - 1 - 2019-03-27T01:00:00+01:00 - 2018-12-10T10:52:44.276+01:00 - 2020-01-15T15:42:32.931+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - ABCD012345670A17 - end_device - true - battery - - - - - - - Plugwise - 158-01 - 255 - 2016-08-02T02:00:00+02:00 - 2019-01-14T16:59:19.417+01:00 - 2020-02-10T11:34:29.122+01:00 - - - - - - - - - - - - - - - - - - ABCD012345670A07 - end_device - true - battery - - - - - - - Telegesis - ETRX3USB - - - 2018-10-29T14:06:55.131+01:00 - 2018-10-29T14:06:55.266+01:00 - - - - - ABCD012345670101 - false - - - - - - - Plugwise - 160-01 - - 2019-06-21T02:00:00+02:00 - 2019-01-21T17:39:23.431+01:00 - 2020-01-15T16:07:46.499+01:00 - - - - - - - - - - - - - - - ABCD012345670A15 - router - true - mains - - - - - - - Plugwise - 160-01 - - 2019-06-21T02:00:00+02:00 - 2019-01-30T08:12:34.679+01:00 - 2020-01-15T15:51:20.214+01:00 - - - - - - - - - - - - - - - ABCD012345670A01 - router - true - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-27T02:00:00+02:00 - 2019-01-23T18:15:08.710+01:00 - 2020-02-10T11:34:32.225+01:00 - - - - - - - - - - - - - - - - - - ABCD012345670A08 - end_device - true - battery - - - - - - diff --git a/userdata/adam_onoff_cooling_fake_firmware/core.appliances.xml b/userdata/adam_onoff_cooling_fake_firmware/core.appliances.xml deleted file mode 100644 index c3ece04d1..000000000 --- a/userdata/adam_onoff_cooling_fake_firmware/core.appliances.xml +++ /dev/null @@ -1,599 +0,0 @@ - - - - Central heating boiler - - heater_central - 2020-10-26T19:31:21.629+01:00 - 2021-12-31T13:48:49.933+01:00 - - - - - boiler_fan_speed_setpoint - Hz - 2020-12-07T09:07:58.503+01:00 - 2020-12-07T09:07:58.503+01:00 - - - - 30.00 - - - - intended_boiler_temperature - C - 2021-12-31T13:36:00.350+01:00 - 2021-12-31T07:58:18.316+01:00 - - - - 35.00 - - - - boiler_temperature - C - 2021-12-31T13:48:49.906+01:00 - 2021-12-31T13:48:49.906+01:00 - PT1H - - - 24.47 - - - - burner_operation_time - s - 2021-12-31T13:00:00+01:00 - 2021-12-31T12:00:00+01:00 - PT1H - - - 0 - - - - open_therm_oem_diagnostic_code - - 2021-12-31T08:04:05.529+01:00 - 2021-12-31T08:04:05.528+01:00 - - - - 0 - - - - domestic_hot_water_burner_starts - - 2020-12-07T15:06:20+01:00 - 2020-12-07T15:06:20+01:00 - - - - 15096 - - - - flame_state - - 2021-12-31T11:48:12.890+01:00 - 2021-12-31T11:48:12.890+01:00 - - - - off - - - - failed_burner_starts - - 2020-12-07T15:06:20+01:00 - 2020-12-07T15:06:20+01:00 - - - - 53 - - - - domestic_hot_water_burner_operation_time - hr - 2020-12-07T15:06:20+01:00 - 2020-12-07T15:06:20+01:00 - - - - 789 - - - - central_heating_state - - 2021-12-31T08:01:11.974+01:00 - 2021-12-31T08:01:11.974+01:00 - - - - on - - - - domestic_hot_water_state - - 2021-12-31T08:02:17.065+01:00 - 2021-12-31T08:02:17.065+01:00 - - - - off - - - - open_therm_oem_fault_code - - 2021-12-31T06:17:30.042+01:00 - 2020-11-03T05:40:17.184+01:00 - - - - 255 - - - - central_heater_water_pressure - bar - 2021-12-31T12:54:07.312+01:00 - 2021-12-31T12:54:07.311+01:00 - - - - 2.00 - - - - flame_current - uA - 2020-12-07T09:08:28.131+01:00 - 2020-12-07T09:08:28.131+01:00 - - - - 7.80 - - - - modulation_level - - 2021-12-31T07:58:27.660+01:00 - 2021-12-31T07:58:27.659+01:00 - - - - 0.00 - - - - burner_operation_time - hr - 2021-12-31T05:50:39+01:00 - 2021-12-31T05:50:39+01:00 - - - - 8726 - - - - open_therm_application_specific_fault_code - - 2021-12-31T06:17:30.042+01:00 - 2020-12-07T17:07:09.637+01:00 - - - - 0 - - - - domestic_hot_water_pump_operation_time - hr - 2020-12-07T15:06:20+01:00 - 2020-12-07T15:06:20+01:00 - - - - 870 - - - - outdoor_temperature - C - 2021-12-31T13:48:46.816+01:00 - 2021-12-31T13:48:18.015+01:00 - PT3H - - - 13.50 - - - - failed_burner_flame_ignitions - - 2020-12-07T15:06:20+01:00 - 2020-12-07T15:06:20+01:00 - - - - 44 - - - - domestic_hot_water_setpoint - C - 2021-12-31T06:20:25.766+01:00 - 2021-04-07T08:30:23.187+02:00 - - - - 60.00 - - - - maximum_boiler_temperature - C - 2021-12-31T13:36:00.127+01:00 - 2021-12-09T13:55:16.719+01:00 - - - - 35.00 - - - - intended_central_heating_state - - 2021-12-31T07:58:16.177+01:00 - 2021-12-31T07:58:16.177+01:00 - - - - off - - - - burner_starts - - 2021-12-31T07:34:07+01:00 - 2021-12-31T07:34:07+01:00 - - - - 72636 - - - - central_heater_pump_operation_time - hr - 2021-12-31T07:51:33+01:00 - 2021-12-31T07:51:33+01:00 - - - - 12350 - - - - domestic_hot_water_comfort_mode - - 2021-04-07T08:30:11.542+02:00 - 2020-10-26T19:47:46.571+01:00 - - - - on - - - - domestic_hot_water_pump_starts - - 2021-12-30T16:06:02+01:00 - 2021-12-30T16:06:02+01:00 - - - - 441797 - - - - central_heater_pump_starts - - 2021-12-31T07:33:38+01:00 - 2021-12-31T07:33:38+01:00 - - - - 2490968 - - - - domestic_hot_water_temperature - C - 2020-12-07T09:08:32.446+01:00 - 2020-12-07T09:08:32.446+01:00 - PT1H - - - 63.50 - - - - cooling_state - - 2021-12-28T15:07:37.695+01:00 - 2021-12-28T15:07:37.695+01:00 - - - - off - - - - return_water_temperature - C - 2021-12-31T13:48:46.339+01:00 - 2021-12-31T13:48:46.339+01:00 - PT1H - - - 24.93 - - - - boiler_fan_speed - Hz - 2020-12-07T09:07:58.503+01:00 - 2020-12-07T09:07:58.503+01:00 - - - - 30.00 - - - - - - 2021-12-31T06:20:25.766+01:00 - domestic_hot_water_setpoint - 60 - 40 - 65 - 0.01 - - - - - 2021-12-31T13:36:00.127+01:00 - maximum_boiler_temperature - 35 - 7 - 50 - 0.01 - - - - - - 2021-04-07T08:30:11.542+02:00 - domestic_hot_water_comfort_mode - on - - - - - Thermostaat WK - A Thermostat - thermostat - 2020-10-26T19:47:45.303+01:00 - 2021-12-31T13:48:41.171+01:00 - - - - - - temperature - C - 2021-12-31T13:48:41.157+01:00 - 2021-12-31T13:48:41.157+01:00 - PT3H - - - 22.53 - - - - intended_central_heating_state - - 2021-12-31T13:46:12.032+01:00 - 2021-12-26T09:56:16.978+01:00 - - - - on - - - - thermostat - C - 2021-12-31T13:48:37.094+01:00 - 2021-12-16T17:15:00.702+01:00 - - - - 21.50 - - - - maximum_modulation_level - - 2020-10-26T19:51:11.197+01:00 - 2020-10-26T19:47:49.466+01:00 - - - - 1.00 - - - - intended_domestic_hot_water_comfort_mode - - 2021-12-31T13:46:12.032+01:00 - 2020-10-26T19:47:45.591+01:00 - - - - on - - - - - - 2021-12-31T13:48:37.094+01:00 - thermostat - 21.5 - 1 - 35 - 0.01 - - - - - - - Gateway - Container for variables logged about the Gateway in general. - gateway - 2020-10-26T19:29:29.541+01:00 - 2021-12-24T15:23:49.836+01:00 - - - - - gateway_mode - - - - - - - - regulation_mode - - 2021-12-16T13:35:09.030+01:00 - 2020-10-26T19:29:29.969+01:00 - - - - cooling - - - - wlan_state - - 2021-12-24T15:23:49.624+01:00 - 2021-12-22T09:16:42.163+01:00 - - - - down - - - - lan_ip_address - - 2021-12-24T15:23:49+01:00 - 2021-12-24T15:23:49+01:00 - - - - 127.0.0.2 - - - - signal_strength - dBm - 2021-12-22T09:16:32.569+01:00 - 2021-12-22T09:16:32.569+01:00 - - - - -48.00 - - - - wlan_ip_address - - 2021-12-24T15:23:49.624+01:00 - 2021-12-22T09:16:42+01:00 - - - - 0.0.0.0 - - - - lan_state - - 2021-12-24T15:23:49.788+01:00 - 2021-12-24T15:17:21.680+01:00 - - - - up - - - - link_quality - - 2021-12-22T09:16:32.569+01:00 - 2021-12-22T09:16:32.569+01:00 - - - - 62 - - - - - - - - gateway_mode - full - - setup - light - away - vacation - - full - secure - - - - - 2021-12-16T13:35:09.030+01:00 - regulation_mode - cooling - - heating - off - bleeding_cold - bleeding_hot - cooling - - - - - diff --git a/userdata/adam_onoff_cooling_fake_firmware/core.locations.xml b/userdata/adam_onoff_cooling_fake_firmware/core.locations.xml deleted file mode 100644 index 901f252fc..000000000 --- a/userdata/adam_onoff_cooling_fake_firmware/core.locations.xml +++ /dev/null @@ -1,896 +0,0 @@ - - - - Home - - building - 2020-10-26T19:29:30.429+01:00 - 2021-12-31T13:47:22.212+01:00 - - home - - - - - humidity - RH - 2021-12-31T13:47:21+01:00 - 2021-12-31T13:47:21+01:00 - PT3H - - - 88.00 - - - - weather_description - - 2021-12-31T13:47:21+01:00 - 2021-12-31T13:47:21+01:00 - - - - clouded - - - - wind_vector - m_s - 2021-12-31T13:47:21+01:00 - 2021-12-31T13:47:21+01:00 - - - - (1.79,228.00) - - - - solar_irradiance - W_m2 - 2021-12-31T13:47:21+01:00 - 2021-12-31T13:47:21+01:00 - - - - 208.25 - - - - outdoor_temperature - C - 2021-12-31T13:47:21+01:00 - 2021-12-31T13:47:21+01:00 - PT3H - - - 13.38 - - - - - - - Slaapkamer JM - - bedroom - 2020-10-26T20:14:43.532+01:00 - 2021-12-31T13:42:47.876+01:00 - - away - - - - - - - - electricity_produced - W - 2020-11-03T05:40:37.085+01:00 - 2020-11-02T21:25:17.648+01:00 - - - 0.00 - - - - thermostat - C - 2021-12-16T13:35:08.807+01:00 - 2021-04-07T08:00:01.259+02:00 - - - 18.00 - - - - temperature - C - 2021-12-31T13:42:47.865+01:00 - 2021-04-07T07:56:10.530+02:00 - PT3H - - 20.00 - - - - electricity_consumed - W - 2021-12-23T13:10:33.630+01:00 - 2021-04-06T12:46:16.748+02:00 - - - 0.00 - - - - relay - - - - - - - - - 2021-12-16T13:35:08.808+01:00 - thermostat - 18 - 0 - 99.9 - 0.01 - - false - false - off - passive - - - - false - single - - - - - Keuken - - kitchen - 2020-11-08T10:12:21.729+01:00 - 2021-12-31T13:48:14.175+01:00 - - away - - - - - - - - relay - - - - - - - thermostat - C - 2021-12-31T08:00:00.595+01:00 - 2021-04-07T08:00:02.103+02:00 - - - 21.50 - - - - temperature - C - 2021-12-31T13:48:14.155+01:00 - 2021-04-07T07:59:38.185+02:00 - PT3H - - 22.50 - - - - electricity_consumed - W - 2021-12-31T08:08:26.977+01:00 - 2021-04-05T22:57:41.866+02:00 - - - 2.13 - - - - electricity_produced - W - 2020-11-08T10:16:20.020+01:00 - - - - 0.00 - - - - - - - false - single - - - 2021-12-31T08:00:00.596+01:00 - thermostat - 21.5 - 0 - 99.9 - 0.01 - - true - true - off - active - - - - - Badkamer 1 - - bathroom - 2020-10-26T20:15:57.585+01:00 - 2021-12-31T13:38:34.585+01:00 - - away - - - - - - - - temperature - C - 2021-12-31T13:38:34.574+01:00 - 2021-04-07T08:02:51.689+02:00 - PT3H - - 21.50 - - - - thermostat - C - 2021-12-31T08:00:00.345+01:00 - 2021-04-07T08:00:03.538+02:00 - - - 20.50 - - - - electricity_produced - W - 2021-12-02T12:02:34.539+01:00 - 2020-11-03T05:40:42.108+01:00 - - - 0.00 - - - - electricity_consumed - W - 2021-12-30T22:59:14.417+01:00 - 2021-04-07T03:18:21.274+02:00 - - - 0.00 - - - - relay - - - - - - - - - - false - single - - - 2021-12-31T08:00:00.346+01:00 - thermostat - 20.5 - 0 - 99.9 - 0.01 - - false - false - off - passive - - - - - Slaapkamer DB - - bedroom - 2020-10-26T20:15:41.745+01:00 - 2021-12-31T13:35:34.796+01:00 - - away - - - - - - - - relay - - - - - - - thermostat - C - 2021-12-22T09:29:44.600+01:00 - 2021-04-07T08:00:03.398+02:00 - - - 18.00 - - - - electricity_produced - W - 2020-11-03T10:13:40.211+01:00 - - - - 0.00 - - - - temperature - C - 2021-12-31T13:35:34.781+01:00 - 2021-04-07T08:04:20.846+02:00 - PT3H - - 22.00 - - - - electricity_consumed - W - 2021-12-26T01:00:36.730+01:00 - 2021-04-02T16:13:17.008+02:00 - - - 0.00 - - - - - - - false - single - - - 2021-12-22T09:29:43.730+01:00 - thermostat - 18 - 0 - 99.9 - 0.01 - - false - false - off - passive - - - - - Woonkamer - - livingroom - 2020-10-26T19:48:17.829+01:00 - 2021-12-31T13:48:41.183+01:00 - - away - - - - - - - - electricity_produced - W - 2021-02-01T17:01:59.051+01:00 - 2020-11-03T05:45:03.181+01:00 - - - 0.00 - - - - temperature - C - 2021-12-31T13:48:41.157+01:00 - 2021-04-07T08:04:32.514+02:00 - PT3H - - 22.53 - - - - thermostat - C - 2021-12-31T08:00:00.699+01:00 - 2021-04-07T08:00:02.245+02:00 - - - 21.50 - - - - relay - - - - - - - electricity_consumed - W - 2021-12-31T07:48:33.204+01:00 - 2021-04-07T06:34:36.303+02:00 - - - 0.00 - - - - - - - false - single - - - 2021-12-31T08:00:00.700+01:00 - thermostat - 21.5 - 1 - 35 - 0.01 - - true - true - off - active - - - - - Badkamer 2 - - bathroom - 2020-10-26T20:16:28.909+01:00 - 2021-12-31T13:43:08.374+01:00 - - away - - - - - - - - relay - - - - - - - electricity_consumed - W - 2021-12-26T04:30:35.520+01:00 - 2021-04-07T08:03:54.353+02:00 - - - 0.00 - - - - temperature - C - 2021-12-31T13:43:08.360+01:00 - 2021-04-07T08:04:14.217+02:00 - PT3H - - 21.90 - - - - electricity_produced - W - - - - - - thermostat - C - 2021-12-31T08:00:00.418+01:00 - 2021-04-07T08:00:03.489+02:00 - - - 20.50 - - - - - - 2021-12-31T08:00:00.419+01:00 - thermostat - 20.5 - 0 - 99.9 - 0.01 - - false - false - off - passive - - - - false - single - - - - - Slaapkamer SJ - - bedroom - 2020-10-26T20:15:17.817+01:00 - 2021-12-31T13:48:17.710+01:00 - - away - - - - - - - - electricity_consumed - W - 2020-11-03T11:16:01.498+01:00 - - - - 0.00 - - - - thermostat - C - 2021-12-21T11:53:40.255+01:00 - 2021-04-07T08:00:02.558+02:00 - - - 20.50 - - - - temperature - C - 2021-12-31T13:48:17.698+01:00 - 2021-04-07T07:59:51.332+02:00 - PT3H - - 22.60 - - - - relay - - - - - - - electricity_produced - W - 2020-11-03T11:16:01.498+01:00 - - - - 0.00 - - - - - - 2021-12-21T11:53:40.256+01:00 - thermostat - 20.5 - 0 - 99.9 - 0.01 - - true - false - off - passive - - - - false - single - - - - - Bijkeuken - - pantry - 2020-10-26T20:14:10.673+01:00 - 2021-12-31T13:45:19.012+01:00 - - away - - - - - - - - thermostat - C - 2021-12-31T08:00:03.203+01:00 - 2021-04-07T08:00:01.969+02:00 - - - 18.00 - - - - electricity_produced - W - 2020-11-08T10:16:47.978+01:00 - 2020-11-02T16:54:02.973+01:00 - - - 0.00 - - - - temperature - C - 2021-12-31T13:45:19.001+01:00 - 2021-04-07T07:53:07.828+02:00 - PT3H - - 18.80 - - - - relay - - - - - - - electricity_consumed - W - 2021-12-31T01:45:36.455+01:00 - 2021-04-07T07:16:14.472+02:00 - - - 0.00 - - - - - - - false - single - - - 2021-12-31T08:00:00.492+01:00 - thermostat - 18 - 0 - 99.9 - 0.01 - - false - false - off - active - - - - - Slaapkamer RB - - bedroom - 2020-10-26T20:15:30.226+01:00 - 2021-12-31T13:48:46.508+01:00 - - away - - - - - - - - electricity_consumed - W - 2021-12-29T07:30:55.567+01:00 - 2021-04-07T03:30:32.301+02:00 - - - 3.13 - - - - electricity_produced - W - - - - - - thermostat - C - 2021-12-29T15:47:23.817+01:00 - 2021-04-07T08:00:03.357+02:00 - - - 17.00 - - - - temperature - C - 2021-12-31T13:48:46.492+01:00 - 2021-04-07T08:04:29.201+02:00 - PT3H - - 20.70 - - - - relay - - - - - - - - - 2021-12-29T15:47:23.818+01:00 - thermostat - 17 - 0 - 99.9 - 0.01 - - false - false - off - passive - - - - false - single - - - - - Slaapkamer SQ - - bedroom - 2020-10-26T20:15:02.704+01:00 - 2021-12-31T13:46:55.002+01:00 - - away - - - - - - - - electricity_consumed - W - 2021-12-22T14:35:59.086+01:00 - 2021-04-07T08:04:48.453+02:00 - - - 0.00 - - - - electricity_produced - W - 2020-11-05T21:01:11.868+01:00 - - - - 0.00 - - - - thermostat - C - 2021-12-16T13:35:09.039+01:00 - 2021-04-07T08:00:03.445+02:00 - - - 18.50 - - - - temperature - C - 2021-12-31T13:46:54.985+01:00 - 2021-04-07T08:04:16.421+02:00 - PT3H - - 21.40 - - - - relay - - - - - - - - - - false - single - - - 2021-12-16T13:35:08.758+01:00 - thermostat - 18.5 - 0 - 99.9 - 0.01 - - true - false - off - passive - - - - diff --git a/userdata/adam_onoff_cooling_fake_firmware/core.modules.xml b/userdata/adam_onoff_cooling_fake_firmware/core.modules.xml deleted file mode 100644 index 9b6974206..000000000 --- a/userdata/adam_onoff_cooling_fake_firmware/core.modules.xml +++ /dev/null @@ -1,893 +0,0 @@ - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-11-03T10:12:22.640+01:00 - 2020-11-04T17:54:14.562+01:00 - - - - - - - - - - - - - - - ABCD012345670A05 - router - true - mains - - - - - - - Plugwise B.V. - 143.1 - - - 2020-10-26T19:42:17.506+01:00 - 2020-10-26T19:47:55.300+01:00 - - - - - - - - - - - - - - - - - - - - - 0.0 - - - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-10-30T10:24:38.959+01:00 - 2020-11-04T17:54:16.061+01:00 - - - - - - - - - - - - - - - ABCD012345670A06 - router - true - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2020-10-27T21:08:54.309+01:00 - 2020-10-27T21:08:57.114+01:00 - - - - - - - - - - - - - - - ABCD012345670A07 - router - true - mains - - - - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-11-02T21:24:38.806+01:00 - 2020-11-04T17:54:20.819+01:00 - - - - - - - - - - - - - - - ABCD012345670A03 - router - true - mains - - - - - - - Telegesis - ETRX3USB - - - 2020-10-26T19:30:33.244+01:00 - 2020-10-26T19:30:33.298+01:00 - - - - - ABCD012345670101 - false - - - - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-10-26T19:54:10.481+01:00 - 2020-11-04T17:54:18.271+01:00 - - - - - - - - - - - - - - - ABCD012345670A15 - router - true - mains - - - - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-11-02T16:53:27.426+01:00 - 2020-11-04T17:54:38.379+01:00 - - - - - - - - - - - - - - - ABCD012345670A12 - router - true - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2020-10-26T20:25:18.007+01:00 - 2020-10-26T20:25:19.835+01:00 - - - - - - - - - - - - - - - ABCD012345670A13 - router - true - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2020-10-27T09:22:31.306+01:00 - 2020-11-08T10:01:36.293+01:00 - - - - - - - - - - - - - - - - - - ABCD012345670A02 - end_device - true - battery - - - - - - - Plugwise - Gateway - AME Smile 2.0 board - - 2020-10-26T19:29:29.199+01:00 - 2021-01-20T00:28:25.582+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - Adam - 6539-1601-4502 - 2018-10-30T10:12:41+01:00 - 2020-10-26T19:30:24.505+01:00 - 2020-10-26T19:42:55.561+01:00 - - - - - - - - - - - - 16-50-001-994 - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2020-10-28T16:02:35.892+01:00 - 2020-10-28T16:02:39.917+01:00 - - - - - - - - - - - - - - - ABCD012345670A01 - router - true - mains - - - - - - - - - - - 2020-10-26T19:29:30.127+01:00 - 2020-10-26T19:29:30.409+01:00 - - - - - - - - - - - - - - - - - - - - - - - - Remeha B.V. - 17.1 - - - 2020-10-26T19:31:21.474+01:00 - 2020-12-07T15:06:20.208+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3.0 - true - 45 - 0 - false - false - false - true - false - true - true - smart_grid_off - off - - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-11-03T11:13:00.448+01:00 - 2020-11-04T19:32:56.934+01:00 - - - - - - - - - - - - - - - ABCD012345670A14 - router - true - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2020-10-27T21:13:47.398+01:00 - 2020-10-27T21:13:50.761+01:00 - - - - - - - - - - - - - - - ABCD012345670A11 - router - true - mains - - - - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-11-02T18:00:12.071+01:00 - 2020-11-04T17:54:20.811+01:00 - - - - - - - - - - - - - - - ABCD012345670A16 - router - true - mains - - - - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-11-02T18:03:59.318+01:00 - 2020-11-04T17:54:18.301+01:00 - - - - - - - - - - - - - - - ABCD012345670A10 - router - true - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2020-10-27T21:07:23.796+01:00 - 2020-10-27T21:07:27.164+01:00 - - - - - - - - - - - - - - - ABCD012345670A09 - router - true - mains - - - - - - - Plugwise - 106-03 - 1 - 2019-03-27T01:00:00+01:00 - - 2020-10-27T09:34:30.962+01:00 - 2020-11-02T21:13:43.476+01:00 - - - - - - - - - - - - ABCD012345670A19 - router - false - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2020-10-28T15:07:24.695+01:00 - 2020-10-28T15:07:28.188+01:00 - - - - - - - - - - - - - - - ABCD012345670A04 - router - true - mains - - - - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-11-03T10:15:11.011+01:00 - 2020-11-04T17:54:18.451+01:00 - - - - - - - - - - - - - - - ABCD012345670A08 - router - true - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2020-10-28T14:59:18.964+01:00 - 2020-10-28T15:00:58.085+01:00 - - - - - - - - - - - - - - - - - - ABCD012345670A17 - end_device - true - battery - - - - - - - Plugwise - 160-01 - - 2020-05-13T02:00:00+02:00 - - 2020-11-02T16:16:28.466+01:00 - 2020-11-04T17:54:14.686+01:00 - - - - - - - - - - - - - - - ABCD012345670A18 - router - true - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2020-10-28T15:14:08.208+01:00 - 2020-10-28T15:14:11.924+01:00 - - - - - - - - - - - - - - - ABCD012345670A20 - router - true - mains - - - - - - diff --git a/userdata/adam_plus_anna/core.appliances.xml b/userdata/adam_plus_anna/core.appliances.xml deleted file mode 100644 index 04de88066..000000000 --- a/userdata/adam_plus_anna/core.appliances.xml +++ /dev/null @@ -1,570 +0,0 @@ - - - - OpenThermThermostat - A Thermostat - thermostat - 2020-06-03T00:26:51.308+02:00 - 2020-07-31T16:04:57.153+02:00 - - - - - - maximum_modulation_level - - 2020-07-31T08:12:56.454+02:00 - 2020-06-03T00:27:08.401+02:00 - - - - 1.00 - - - - - - - Central heating boiler - - heater_central - 2020-02-22T15:18:04.473+01:00 - 2020-03-15T17:14:24.297+01:00 - - - - - 2020-03-15T14:58:57+01:00 - burner_operation_time - hr - 2020-03-15T14:58:57+01:00 - - 8068 - - - - - 2020-03-15T16:20:46+01:00 - burner_starts - - 2020-03-15T16:20:46+01:00 - - 17392 - - - - - 2020-03-15T17:06:34.144+01:00 - intended_boiler_temperature - C - 2020-03-15T16:40:18.250+01:00 - - 0.00 - - - - - 2020-03-15T09:20:40.161+01:00 - domestic_hot_water_state - - 2020-03-15T09:20:40.161+01:00 - - off - - - - - 2020-03-15T16:40:16.841+01:00 - intended_central_heating_state - - 2020-03-15T16:40:16.841+01:00 - - off - - - - - 2020-03-15T16:41:23.838+01:00 - central_heating_state - - 2020-03-15T16:41:23.838+01:00 - - off - - - - - 2020-03-15T16:40:18.860+01:00 - flame_state - - 2020-03-15T16:40:18.860+01:00 - - off - - - - - 2020-03-02T15:37:21+01:00 - failed_burner_flame_ignitions - - 2020-03-02T15:37:21+01:00 - - 30 - - - - - 2020-03-02T09:35:08.757+01:00 - central_heater_water_pressure - bar - 2020-02-22T15:33:15.909+01:00 - - 6.00 - - - - - 2020-03-15T09:45:11.237+01:00 - open_therm_application_specific_fault_code - - 2020-02-22T15:33:14.759+01:00 - - 0 - - - - - 2020-03-15T17:00:00+01:00 - burner_operation_time - s - 2020-03-15T16:00:00+01:00 - PT1H - - 0 - - - - - - thermostat - C - - - - - 2020-03-15T09:45:11.237+01:00 - open_therm_oem_fault_code - - 2020-02-22T15:33:28.343+01:00 - - 255 - - - - - 2020-03-07T11:43:25.658+01:00 - domestic_hot_water_comfort_mode - - 2020-02-22T15:41:01.237+01:00 - - off - - - - - 2020-03-15T17:14:24.268+01:00 - boiler_temperature - C - 2020-03-15T17:14:24.268+01:00 - - 47.00 - - - - - 2020-03-02T15:41:08+01:00 - failed_burner_starts - - 2020-03-02T15:41:08+01:00 - - 3 - - - - - - temperature - C - - - - - 2020-02-22T15:33:15.986+01:00 - maximum_boiler_temperature - C - 2020-02-22T15:33:13.654+01:00 - - 80.00 - - - - - 2020-03-14T18:41:37+01:00 - domestic_hot_water_burner_operation_time - hr - 2020-03-14T18:41:37+01:00 - - 795 - - - - - - - - 2020-03-07T11:43:25.658+01:00 - domestic_hot_water_comfort_mode - off - - - 2020-02-22T15:33:15.986+01:00 - maximum_boiler_temperature - 80 - 0 - 100 - 1 - - - - - - thermostat - nil - 0 - 30 - 1 - - - - - - - MediaCenter - A smart plug that can be switched on/off and measure power usage. - hometheater - 2020-02-28T17:37:35.489+01:00 - 2020-03-15T17:02:02.199+01:00 - - - - - - 2020-03-15T16:49:21.557+01:00 - electricity_consumed - W - 2020-03-15T10:02:47.406+01:00 - - 10.31 - - - - - 2020-03-15T16:49:21.557+01:00 - electricity_produced - W - 2020-02-28T17:37:38.617+01:00 - - 0.00 - - - - - 2020-03-15T17:02:02.192+01:00 - relay - - 2020-03-13T16:23:35.100+01:00 - - on - - - - - 2020-03-15T17:00:00+01:00 - electricity_consumed - Wh - 2020-03-15T16:45:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-15T17:00:00+01:00 - electricity_produced - Wh - 2020-03-15T16:45:00+01:00 - PT15M - - 0.00 - - - - - - - 2020-03-15T17:02:02.192+01:00 - false - on - - - - - - Gateway D40FB2019891 - Container for variables logged about the Gateway in general. - gateway - 2019-08-15T16:18:34.886+02:00 - 2020-03-15T17:09:57.204+01:00 - - - - - 2020-03-15T17:09:57.166+01:00 - wlan_state - - 2020-03-15T14:15:38.058+01:00 - - up - - - - - 2020-03-15T17:09:57.166+01:00 - wlan_ip_address - - 2020-03-02T17:21:52+01:00 - - 127.0.0.1 - - - - - 2020-02-22T15:41:01.324+01:00 - regulation_mode - - 2020-02-22T15:17:34.756+01:00 - - heating - - - - - 2020-03-15T17:09:57.165+01:00 - link_quality - - 2020-03-15T17:09:57.165+01:00 - - 54 - - - - - 2020-03-15T17:09:57.165+01:00 - signal_strength - dBm - 2020-03-15T17:09:57.165+01:00 - - -56.00 - - - - - 2020-03-15T17:08:55.940+01:00 - lan_state - - 2019-08-15T16:18:35.318+02:00 - - down - - - - - - - - 2020-02-22T15:41:01.324+01:00 - regulation_mode - heating - - - - - OpenThermGateway - An OpenTherm Gateway - open_therm_gateway - 2019-08-15T16:18:41.017+02:00 - 2019-08-15T16:18:43.373+02:00 - - - - - 2020-03-07T11:43:32.937+01:00 - override_mode - - 2019-08-15T16:18:41.403+02:00 - - on - - - - - 2020-03-07T11:43:33.561+01:00 - open_therm_power_mode - - 2019-08-15T16:18:43.359+02:00 - - 0 - - - - - - - - Anna - A Thermostat - thermostat - 2020-02-22T15:33:28.511+01:00 - 2020-03-15T17:14:18.760+01:00 - - - - - - 2020-03-15T17:11:52.660+01:00 - intended_domestic_hot_water_comfort_mode - - 2020-02-22T15:33:32.056+01:00 - - off - - - - - 2020-03-15T17:11:15.854+01:00 - temperature - C - 2020-03-15T17:07:43.789+01:00 - - 20.46 - - - - - 2020-03-15T17:11:52.660+01:00 - intended_central_heating_state - - 2020-03-15T16:31:18.370+01:00 - - on - - - - - 2020-03-15T17:14:18.744+01:00 - thermostat - C - 2020-03-15T16:30:00.282+01:00 - - 20.50 - - - - - - - 2020-03-15T17:14:18.744+01:00 - thermostat - 20.5 - 1 - 35 - 0.01 - - - - - - - Work-PC - A smart plug that can be switched on/off and measure power usage. - computer_desktop - 2020-02-29T22:56:59.235+01:00 - 2020-03-15T17:14:36.105+01:00 - - - - - - 2020-03-15T17:00:00+01:00 - electricity_produced - Wh - 2020-03-15T16:45:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-15T17:14:36.102+01:00 - electricity_consumed - W - 2020-03-15T17:14:36.102+01:00 - - 79.81 - - - - - 2020-03-15T17:00:00+01:00 - electricity_consumed - Wh - 2020-03-15T16:45:00+01:00 - PT15M - - 7.03 - - - - - 2020-03-15T17:14:36.103+01:00 - electricity_produced - W - 2020-03-02T17:21:50.489+01:00 - - 0.00 - - - - - 2020-03-15T17:05:41.273+01:00 - relay - - 2020-02-29T22:59:46.295+01:00 - - on - - - - - - - 2020-03-15T17:05:41.273+01:00 - false - on - - - - - diff --git a/userdata/adam_plus_anna/core.direct_objects.xml b/userdata/adam_plus_anna/core.direct_objects.xml deleted file mode 100644 index 8017a3a93..000000000 --- a/userdata/adam_plus_anna/core.direct_objects.xml +++ /dev/null @@ -1,763 +0,0 @@ - - - - Central heating boiler - - heater_central - 2020-02-22T15:18:04.473+01:00 - 2020-03-15T17:09:39.846+01:00 - - - - - 2020-03-15T14:58:57+01:00 - burner_operation_time - hr - 2020-03-15T14:58:57+01:00 - - 8068 - - - - - 2020-03-15T16:20:46+01:00 - burner_starts - - 2020-03-15T16:20:46+01:00 - - 17392 - - - - - 2020-03-15T16:56:33.144+01:00 - intended_boiler_temperature - C - 2020-03-15T16:40:18.250+01:00 - - 0.00 - - - - - 2020-03-15T09:20:40.161+01:00 - domestic_hot_water_state - - 2020-03-15T09:20:40.161+01:00 - - off - - - - - 2020-03-15T16:40:16.841+01:00 - intended_central_heating_state - - 2020-03-15T16:40:16.841+01:00 - - off - - - - - 2020-03-15T16:41:23.838+01:00 - central_heating_state - - 2020-03-15T16:41:23.838+01:00 - - off - - - - - 2020-03-15T16:40:18.860+01:00 - flame_state - - 2020-03-15T16:40:18.860+01:00 - - off - - - - - 2020-03-02T15:37:21+01:00 - failed_burner_flame_ignitions - - 2020-03-02T15:37:21+01:00 - - 30 - - - - - 2020-03-02T09:35:08.757+01:00 - central_heater_water_pressure - bar - 2020-02-22T15:33:15.909+01:00 - - 6.00 - - - - - 2020-03-15T09:45:11.237+01:00 - open_therm_application_specific_fault_code - - 2020-02-22T15:33:14.759+01:00 - - 0 - - - - - 2020-03-15T17:00:00+01:00 - burner_operation_time - s - 2020-03-15T16:00:00+01:00 - PT1H - - 0 - - - - - - thermostat - C - - - - - 2020-03-15T09:45:11.237+01:00 - open_therm_oem_fault_code - - 2020-02-22T15:33:28.343+01:00 - - 255 - - - - - 2020-03-07T11:43:25.658+01:00 - domestic_hot_water_comfort_mode - - 2020-02-22T15:41:01.237+01:00 - - off - - - - - 2020-03-15T17:00:29.009+01:00 - boiler_temperature - C - 2020-03-15T17:00:29.008+01:00 - - 48.00 - - - - - 2020-03-02T15:41:08+01:00 - failed_burner_starts - - 2020-03-02T15:41:08+01:00 - - 3 - - - - - - temperature - C - - - - - 2020-02-22T15:33:15.986+01:00 - maximum_boiler_temperature - C - 2020-02-22T15:33:13.654+01:00 - - 80.00 - - - - - 2020-03-14T18:41:37+01:00 - domestic_hot_water_burner_operation_time - hr - 2020-03-14T18:41:37+01:00 - - 795 - - - - - - - - 2020-03-07T11:43:25.658+01:00 - domestic_hot_water_comfort_mode - off - - - 2020-02-22T15:33:15.986+01:00 - maximum_boiler_temperature - 80 - 0 - 100 - 1 - - - - - - thermostat - nil - 0 - 30 - 1 - - - - - - - Gateway D40FB2019891 - Container for variables logged about the Gateway in general. - gateway - 2019-08-15T16:18:34.886+02:00 - 2020-03-15T17:09:57.204+01:00 - - - - - 2020-03-15T17:09:57.166+01:00 - wlan_state - - 2020-03-15T14:15:38.058+01:00 - - up - - - - - 2020-03-15T17:09:57.166+01:00 - wlan_ip_address - - 2020-03-02T17:21:52+01:00 - - 127.0.0.1 - - - - - 2020-02-22T15:41:01.324+01:00 - regulation_mode - - 2020-02-22T15:17:34.756+01:00 - - heating - - - - - 2020-03-15T17:09:57.165+01:00 - link_quality - - 2020-03-15T17:09:57.165+01:00 - - 54 - - - - - 2020-03-15T17:09:57.165+01:00 - signal_strength - dBm - 2020-03-15T17:09:57.165+01:00 - - -56.00 - - - - - 2020-03-15T17:08:55.940+01:00 - lan_state - - 2019-08-15T16:18:35.318+02:00 - - down - - - - - - - - 2020-02-22T15:41:01.324+01:00 - regulation_mode - heating - - - - - Anna - A Thermostat - thermostat - 2020-02-22T15:33:28.511+01:00 - 2020-03-15T17:13:55.469+01:00 - - - - - - 2020-03-15T17:11:52.660+01:00 - intended_domestic_hot_water_comfort_mode - - 2020-02-22T15:33:32.056+01:00 - - off - - - - - 2020-03-15T17:11:15.854+01:00 - temperature - C - 2020-03-15T17:07:43.789+01:00 - - 20.46 - - - - - 2020-03-15T17:11:52.660+01:00 - intended_central_heating_state - - 2020-03-15T16:31:18.370+01:00 - - on - - - - - 2020-03-15T17:13:55.440+01:00 - thermostat - C - 2020-03-15T16:30:00.282+01:00 - - 20.50 - - - - - - - 2020-03-15T17:13:55.440+01:00 - thermostat - 20.5 - 1 - 35 - 0.01 - - - - - - - MediaCenter - A smart plug that can be switched on/off and measure power usage. - hometheater - 2020-02-28T17:37:35.489+01:00 - 2020-03-15T17:02:02.199+01:00 - - - - - - 2020-03-15T16:49:21.557+01:00 - electricity_consumed - W - 2020-03-15T10:02:47.406+01:00 - - 10.31 - - - - - 2020-03-15T16:49:21.557+01:00 - electricity_produced - W - 2020-02-28T17:37:38.617+01:00 - - 0.00 - - - - - 2020-03-15T17:02:02.192+01:00 - relay - - 2020-03-13T16:23:35.100+01:00 - - on - - - - - 2020-03-15T17:00:00+01:00 - electricity_consumed - Wh - 2020-03-15T16:45:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-15T17:00:00+01:00 - electricity_produced - Wh - 2020-03-15T16:45:00+01:00 - PT15M - - 0.00 - - - - - - - 2020-03-15T17:02:02.192+01:00 - false - on - - - - - - TV - - livingroom - 2020-03-15T16:23:34.980+01:00 - 2020-03-15T16:23:39.032+01:00 - - home - - - - - - - - electricity_consumed - W - - - - - electricity_produced - W - - - - - relay - - - - - - - - false - single - - - - - Living room - The room containing the (central) home thermostat. - livingroom - 2020-02-22T15:33:29.353+01:00 - 2020-03-15T17:07:43.825+01:00 - - home - - - - - - - 2020-03-15T16:30:00.282+01:00 - thermostat - C - 2020-03-07T07:30:00.690+01:00 - - 20.50 - - - - 2020-03-02T17:21:50.489+01:00 - electricity_produced - W - 2020-02-29T22:57:24.739+01:00 - - 0.00 - - - - 2020-03-15T16:22:47.824+01:00 - electricity_consumed - W - 2020-03-07T10:26:26.332+01:00 - - 74.19 - - - - - relay - - - - - 2020-03-15T17:07:43.789+01:00 - temperature - - 2020-03-07T10:35:23.442+01:00 - - 20.46 - - - - - - 2020-03-15T07:30:00.347+01:00 - thermostat - 20.5 - 1 - 35 - 0.01 - - false - true - - - - - OpenThermGateway - An OpenTherm Gateway - open_therm_gateway - 2019-08-15T16:18:41.017+02:00 - 2019-08-15T16:18:43.373+02:00 - - - - - 2020-03-07T11:43:32.937+01:00 - override_mode - - 2019-08-15T16:18:41.403+02:00 - - on - - - - - 2020-03-07T11:43:33.561+01:00 - open_therm_power_mode - - 2019-08-15T16:18:43.359+02:00 - - 0 - - - - - - - - Bouwe-PC - A smart plug that can be switched on/off and measure power usage. - computer_desktop - 2020-02-29T22:56:59.235+01:00 - 2020-03-15T17:14:16.049+01:00 - - - - - - 2020-03-15T17:00:00+01:00 - electricity_produced - Wh - 2020-03-15T16:45:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-15T17:14:16.046+01:00 - electricity_consumed - W - 2020-03-15T17:14:16.046+01:00 - - 79.31 - - - - - 2020-03-15T17:00:00+01:00 - electricity_consumed - Wh - 2020-03-15T16:45:00+01:00 - PT15M - - 7.03 - - - - - 2020-03-15T17:14:16.047+01:00 - electricity_produced - W - 2020-03-02T17:21:50.489+01:00 - - 0.00 - - - - - 2020-03-15T17:05:41.273+01:00 - relay - - 2020-02-29T22:59:46.295+01:00 - - on - - - - - - - 2020-03-15T17:05:41.273+01:00 - false - on - - - - - - Home - - building - 2019-08-15T16:18:30.658+02:00 - 2020-03-15T17:12:15.315+01:00 - - home - - - - - 2020-03-15T17:07:29+01:00 - humidity - RH - 2020-03-15T17:07:29+01:00 - - 58.00 - - - - - 2020-03-15T17:07:29+01:00 - solar_irradiance - W_m2 - 2020-03-15T17:07:29+01:00 - - 53.75 - - - - - 2020-03-15T17:07:29+01:00 - outdoor_temperature - C - 2020-03-15T17:07:29+01:00 - - 11.88 - - - - - 2020-03-15T17:07:29+01:00 - weather_description - - 2020-03-15T17:07:29+01:00 - - overcast - - - - - 2020-03-15T17:07:29+01:00 - wind_vector - m_s - 2020-03-15T17:07:29+01:00 - - (2.60,220.00) - - - - - - - - Werkplek - - livingroom - 2020-03-15T16:22:46.818+01:00 - 2020-03-15T17:14:16.058+01:00 - - home - - - - - - - - relay - - - - - - electricity_produced - W - - - - 2020-03-15T17:14:16.046+01:00 - electricity_consumed - W - - - 79.31 - - - - - - - false - single - - - - diff --git a/userdata/adam_plus_anna/core.locations.xml b/userdata/adam_plus_anna/core.locations.xml deleted file mode 100644 index af6d23585..000000000 --- a/userdata/adam_plus_anna/core.locations.xml +++ /dev/null @@ -1,220 +0,0 @@ - - - - Home - - building - 2019-08-15T16:18:30.658+02:00 - 2020-03-15T17:12:15.315+01:00 - - home - - - - - 2020-03-15T17:07:29+01:00 - humidity - RH - 2020-03-15T17:07:29+01:00 - - 58.00 - - - - - 2020-03-15T17:07:29+01:00 - solar_irradiance - W_m2 - 2020-03-15T17:07:29+01:00 - - 53.75 - - - - - 2020-03-15T17:07:29+01:00 - outdoor_temperature - C - 2020-03-15T17:07:29+01:00 - - 11.88 - - - - - 2020-03-15T17:07:29+01:00 - weather_description - - 2020-03-15T17:07:29+01:00 - - overcast - - - - - 2020-03-15T17:07:29+01:00 - wind_vector - m_s - 2020-03-15T17:07:29+01:00 - - (2.60,220.00) - - - - - - - - Werkplek - - livingroom - 2020-03-15T16:22:46.818+01:00 - 2020-03-15T17:14:56.169+01:00 - - home - - - - - - - - relay - - - - - - electricity_produced - W - - - - 2020-03-15T17:14:56.155+01:00 - electricity_consumed - W - - - 80.50 - - - - - - - false - single - - - - - TV - - livingroom - 2020-03-15T16:23:34.980+01:00 - 2020-03-15T16:23:39.032+01:00 - - home - - - - - - - - electricity_consumed - W - - - - - electricity_produced - W - - - - - relay - - - - - - - - false - single - - - - - Living room - The room containing the (central) home thermostat. - livingroom - 2020-02-22T15:33:29.353+01:00 - 2020-03-15T17:07:43.825+01:00 - - home - - - - - - - 2020-03-15T16:30:00.282+01:00 - thermostat - C - 2020-03-07T07:30:00.690+01:00 - - 20.50 - - - - 2020-03-02T17:21:50.489+01:00 - electricity_produced - W - 2020-02-29T22:57:24.739+01:00 - - 0.00 - - - - 2020-03-15T16:22:47.824+01:00 - electricity_consumed - W - 2020-03-07T10:26:26.332+01:00 - - 74.19 - - - - - relay - - - - - 2020-03-15T17:07:43.789+01:00 - temperature - - 2020-03-07T10:35:23.442+01:00 - - 20.46 - - - - - - 2020-03-15T07:30:00.347+01:00 - thermostat - 20.5 - 1 - 35 - 0.01 - - false - true - - - - diff --git a/userdata/adam_plus_anna/core.modules.xml b/userdata/adam_plus_anna/core.modules.xml deleted file mode 100644 index 7a50dcd34..000000000 --- a/userdata/adam_plus_anna/core.modules.xml +++ /dev/null @@ -1,272 +0,0 @@ - - - - Plugwise - Gateway - AME Smile 2.0 board - - 2019-08-15T16:18:29.628+02:00 - 2020-02-22T15:17:34.302+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - Plugwise B.V. - 143.1 - - - 2020-02-22T15:33:28.039+01:00 - 2020-02-22T15:33:52.388+01:00 - - - - - - - - - - - - - - - - - - 0.0 - - - - - - Plugwise - Adam - 6539-1601-4502 - 2018-10-30T10:12:41+01:00 - 2019-08-15T16:18:38.925+02:00 - 2020-02-22T15:38:53.823+01:00 - - - - - - - - - - - - 16-50-001-505 - - - - - - - - - - - 2019-08-15T16:18:30.152+02:00 - 2020-02-22T15:18:11.647+01:00 - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - 160-01 - - 2019-06-21T02:00:00+02:00 - 2020-02-28T17:37:35.085+01:00 - 2020-02-28T17:47:49.324+01:00 - - - - - - - - - - - - - - - ABCD012345670A01 - router - true - mains - - - - - - - - - - - 2020-02-22T15:18:04.283+01:00 - 2020-03-07T16:30:50.318+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.0 - smart_grid_off - off - - - - - Telegesis - ETRX3USB - - - 2019-08-15T16:18:41.530+02:00 - 2019-08-15T16:18:41.619+02:00 - - - - - ABCD012345670101 - false - - - - - - - Plugwise - - - 2019-06-21T02:00:00+02:00 - 2020-02-29T22:56:58.823+01:00 - 2020-02-29T23:05:15.393+01:00 - - - - - - - - - - - - - - - ABCD012345670A02 - router - true - mains - - - - - - diff --git a/userdata/adam_plus_anna_new/core.appliances.xml b/userdata/adam_plus_anna_new/core.appliances.xml deleted file mode 100644 index 94a070d93..000000000 --- a/userdata/adam_plus_anna_new/core.appliances.xml +++ /dev/null @@ -1,953 +0,0 @@ - - - - SmartPlug Floor 0 - A device that communicates through the ZigBee protocol. - 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 - - - - - - electricity_consumed - Wh - 2023-12-22T16:15:00+01:00 - 2023-12-22T16:00:00+01:00 - PT15M - - - 0.00 - - - - electricity_produced - Wh - - - PT15M - - - - relay - - 2023-12-22T16:18:09.841+01:00 - 2022-06-11T15:25:12.796+02:00 - - - - on - - - - - - 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 - 2023-12-22T16:30:19.645+01:00 - - - - - - - - thermostat - C - 2023-12-22T16:30:00.357+01:00 - 2023-12-22T16:30:00.357+01:00 - - - - 18.50 - - - - intended_domestic_hot_water_comfort_mode - - 2023-12-22T16:27:51.647+01:00 - 2023-12-22T16:27:51.647+01:00 - - - - on - - - - intended_central_heating_state - - 2023-12-22T16:27:51.647+01:00 - 2023-12-22T16:27:51.647+01:00 - - - - off - - - - temperature - C - 2023-12-22T16:30:19.629+01:00 - 2023-12-22T16:30:19.629+01:00 - PT3H - - - 18.36 - - - - maximum_modulation_level - - 2021-12-18T10:33:33.788+01:00 - 2021-12-18T10:33:32.832+01:00 - - - - 1.00 - - - - - - 2023-12-22T16:30:00.358+01:00 - thermostat - 1 - 35 - 0.01 - 18.5 - - - - - - - Central heating boiler - - heater_central - 2021-12-16T19:30:21.331+01:00 - 2023-12-22T16:30:27.732+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 - 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 - - 2023-12-19T10:05:37.544+01:00 - 2023-12-19T10:05:37.544+01:00 - - - - off - - - - central_heating_state - - 2023-12-22T16:30:24.455+01:00 - 2023-12-22T16:30:24.455+01:00 - - - - on - - - - intended_central_heating_state - - 2023-12-22T16:30:02.548+01:00 - 2023-12-22T16:30:02.548+01:00 - - - - on - - - - failed_burner_flame_ignitions - - 2023-03-24T14:52:56+01:00 - 2023-03-24T14:52:56+01: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 - - - - 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 - - 2023-12-22T11:11:02.869+01:00 - 2023-12-22T11:11:02.868+01:00 - - - - 255 - - - - burner_operation_time - s - 2023-12-22T16:00:00+01:00 - 2023-12-22T15:00:00+01:00 - PT1H - - - 16 - - - - burner_operation_time - hr - 2023-12-22T12:35:33+01:00 - 2023-12-22T12:35:33+01:00 - - - - 10721 - - - - domestic_hot_water_comfort_mode - - 2023-08-17T00:05:50.772+02:00 - 2023-08-17T00:05:50.772+02:00 - - - - off - - - - flame_state - - 2023-12-22T16:30:24.472+01:00 - 2023-12-22T16:30:24.472+01:00 - - - - on - - - - cooling_enabled - - 2023-12-10T11:40:02.026+01:00 - 2023-12-10T11:40:02.026+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 - - 2023-12-22T11:11:02.869+01:00 - 2023-12-22T11:11:02.868+01:00 - - - - 0 - - - - - - - 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 Werkplek - A smart plug that can be switched on/off and measure power usage. - computer_desktop - 2021-12-16T19:30:42.936+01:00 - 2023-12-22T16:30:24.573+01:00 - - - - - - - - electricity_produced - 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:24.542+01:00 - 2023-12-22T16:30:24.542+01:00 - - - - 0.00 - - - - relay - - 2023-12-22T16:24:29.783+01:00 - 2023-12-22T16:24:29.783+01:00 - - - - on - - - - electricity_consumed - Wh - 2023-12-22T16:15:00+01:00 - 2023-12-22T16:00:00+01:00 - PT15M - - - 23.00 - - - - electricity_consumed - W - 2023-12-22T16:30:24.542+01:00 - 2023-12-22T16:30:24.542+01:00 - - - - 87.63 - - - - - - 2023-12-22T16:24:29.783+01:00 - false - on - - - - - - Tom Badkamer - 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 - 2023-12-22T16:22:29.987+01:00 - - - - - - thermostat - C - 2023-12-22T07:02:11.280+01:00 - 2023-12-22T07:02:11.280+01:00 - - - - 18.00 - - - - temperature_difference - C - 2023-12-22T15:31:28.848+01:00 - 2023-12-22T15:31:28.848+01:00 - - - - -0.20 - - - - temperature - C - 2023-12-22T16:22:29.981+01:00 - 2023-12-22T16:22:29.981+01:00 - PT3H - - - 17.56 - - - - battery - - 2023-12-22T10:13:07.513+01:00 - 2023-12-22T10:13:07.513+01:00 - - - - 0.99 - - - - temperature_offset - C - 2023-12-13T09:39:02.838+01:00 - 2023-12-13T09:39:02.838+01:00 - - - - 0.10 - - - - valve_position - - 2023-12-22T04:32:11.454+01:00 - 2023-12-22T04:32:11.454+01:00 - - - - 1.00 - - - - uncorrected_temperature - C - 2023-12-22T16:22:29.981+01:00 - 2023-12-22T16:22:29.981+01:00 - - - - 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 - - - - - - 2023-12-22T16:29:30.555+01:00 - true - on - - - - - - OpenThermGateway - An OpenTherm Gateway - open_therm_gateway - 2021-12-16T19:30:28.533+01:00 - 2023-12-17T18:34:07.141+01:00 - - - - - override_mode - - 2023-12-17T18:34:07.138+01:00 - 2023-12-17T18:34:07.138+01:00 - - - - on - - - - open_therm_power_mode - - 2023-08-17T00:05:59.286+02:00 - 2023-08-17T00:05:59.286+02:00 - - - - 0 - - - - - - - Gateway - Container for variables logged about the Gateway in general. - gateway - 2021-12-16T19:30:16.149+01:00 - 2023-12-22T16:27:33.624+01:00 - - - - - signal_strength - dBm - 2023-12-22T16:26:50.907+01:00 - 2023-12-22T16:26:50.907+01:00 - - - - -62.00 - - - - link_quality - - 2023-12-22T16:26:50.907+01:00 - 2023-12-22T16:26:50.907+01:00 - - - - 48 - - - - lan_state - - 2023-12-22T16:27:33.603+01:00 - 2023-12-22T16:27:33.603+01:00 - - - - down - - - - wlan_state - - 2023-12-22T16:26:50.908+01:00 - 2023-12-22T16:26:50.908+01:00 - - - - up - - - - regulation_mode - - 2023-12-10T11:40:02.539+01:00 - 2023-07-28T20:28:08.585+02:00 - - - - heating - - - - lan_ip_address - - 2023-12-22T16:27:33+01:00 - 2023-12-22T16:27:33+01:00 - - - - 0.0.0.0 - - - - gateway_mode - - 2023-12-02T11:35:46.017+01:00 - - - - - full - - - - wlan_ip_address - - 2023-12-22T16:26:50+01:00 - 2023-12-22T16:26:50+01:00 - - - - 127.0.0.1 - - - - - - - 2023-12-10T11:40:02.539+01:00 - regulation_mode - heating - - bleeding_hot - bleeding_cold - off - heating - - - - - 2023-12-02T11:35:46.017+01:00 - gateway_mode - full - - full - - setup - light - secure - away - vacation - - - - - diff --git a/userdata/adam_plus_anna_new/core.locations.xml b/userdata/adam_plus_anna_new/core.locations.xml deleted file mode 100644 index 013528b93..000000000 --- a/userdata/adam_plus_anna_new/core.locations.xml +++ /dev/null @@ -1,235 +0,0 @@ - - - - Home - - building - 2021-12-16T19:30:17.225+01:00 - 2023-12-22T16:18:55.645+01:00 - - home - - - - - weather_description - - 2023-12-22T16:13:01+01:00 - 2023-12-22T16:13:01+01:00 - - - - rain - - - - humidity - RH - 2023-12-22T16:13:01+01:00 - 2023-12-22T16:13:01+01:00 - PT3H - - - 90.00 - - - - solar_irradiance - W_m2 - 2023-12-22T16:13:01+01:00 - 2023-12-22T16:13:01+01:00 - - - - 3.00 - - - - wind_vector - m_s - 2023-12-22T16:13:01+01:00 - 2023-12-22T16:13:01+01:00 - - - - (6.26,291.00) - - - - outdoor_temperature - C - 2023-12-22T16:13:01+01:00 - 2023-12-22T16:13:01+01:00 - PT3H - - - 9.19 - - - - - - - Bathroom - - bathroom - 2021-12-16T19:37:57.444+01:00 - 2023-12-22T16:18:09.849+01:00 - - home - - - - - - - - relay - - - - - - - electricity_produced - W - 2023-12-02T09:50:02.323+01:00 - 2023-08-16T23:58:55.515+02:00 - - - 0.00 - - - - temperature - C - 2023-12-22T16:18:09.838+01:00 - 2023-08-16T23:52:07.632+02:00 - PT3H - - 16.50 - - - - thermostat - C - 2023-12-22T07:00:05.510+01:00 - 2023-08-16T20:58:30.470+02:00 - - - 18.00 - - - - electricity_consumed - W - 2023-12-02T09:50:02.323+01:00 - 2023-08-16T23:58:55.515+02:00 - - - 0.00 - - - - - - 2023-12-22T07:00:00.321+01:00 - thermostat - 0 - 99.9 - 0.01 - 18 - - true - true - preheating - passive - - - - - Living room - The room containing the (central) home thermostat. - livingroom - 2021-12-16T19:30:56.643+01:00 - 2023-12-22T16:31:09.658+01:00 - - home - - - - - - - - - - temperature - C - 2023-12-22T16:31:05.873+01:00 - 2023-08-17T00:01:50.312+02:00 - PT3H - - 18.33 - - - - thermostat - - 2023-12-22T16:31:01.839+01:00 - 2023-08-17T00:01:46.191+02:00 - - - 18.50 - - - - electricity_consumed - W - 2023-12-22T16:31:09.616+01:00 - 2023-08-16T23:53:22.531+02:00 - - - 147.81 - - - - relay - - - - - - - electricity_produced - W - 2023-12-22T16:31:09.616+01:00 - 2023-08-16T23:53:22.531+02:00 - - - 0.00 - - - - - - - false - single - - - 2023-12-22T16:30:00.358+01:00 - thermostat - 1 - 35 - 0.01 - 18.5 - - true - true - heating - active - - - - diff --git a/userdata/adam_plus_anna_new/core.modules.xml b/userdata/adam_plus_anna_new/core.modules.xml deleted file mode 100644 index 429f5bd78..000000000 --- a/userdata/adam_plus_anna_new/core.modules.xml +++ /dev/null @@ -1,527 +0,0 @@ - - - - LUMI - lumi.plug.maeu01 - - - - 2022-03-11T11:21:37.406+01:00 - 2022-03-11T18:44:23.929+01:00 - - - - - - - - - - - - 54EF4410002C97F2 - router - true - mains - - - - 63 - 1 - sibling - - - 75 - 1 - sibling - - - 67 - 0 - parent - - - 2023-12-22T16:24:36+01:00 - true - - - - - Telegesis - ETRX3587-LRS - - - 2021-12-16T19:30:38.437+01:00 - 2022-11-03T11:35:39.755+01:00 - - - - - 000D6F000D5A168D - false - - - 255 - 15 - None of the above - - - 255 - 1 - child - - - 255 - 15 - None of the above - - - 255 - 1 - child - - - 255 - 15 - None of the above - - - 2023-12-22T16:24:36+01:00 - true - - - - - - Plugwise - 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 - - - - - - - - - - - - 16-50-001-505 - - - - - - - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - 000D6F000C8FF5EE - end_device - true - battery - false - false - - 0 - - - - false - - - - - Plugwise - 160-01 - - 2020-11-10T01:00:00+01:00 - - 2021-12-16T19:30:41.519+01:00 - 2021-12-16T19:30:48.319+01:00 - - - - - - - - - - - - - - - 000D6F000D13CB6F - router - true - mains - - - - 255 - 15 - None of the above - - - 255 - 15 - None of the above - - - 255 - 0 - None of the above - - - 2023-12-22T16:02:27+01:00 - true - - - - - - - - - 2021-12-16T19:30:16.990+01:00 - 2021-12-16T19:30:17.206+01:00 - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - 160-01 - - 2020-11-10T01:00:00+01:00 - - 2021-12-16T19:30:41.080+01:00 - 2021-12-16T19:30:48.412+01:00 - - - - - - - - - - - - - - - 000D6F000D13CCFD - router - true - mains - - - - 255 - 15 - None of the above - - - 255 - 15 - None of the above - - - 255 - 0 - None of the above - - - 2023-12-22T16:28:31+01:00 - true - - - - - - - - - 2021-12-16T19:30:21.157+01:00 - 2022-11-03T11:34:40.387+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.0 - smart_grid_off - off - - - - - Plugwise - Gateway - AME Smile 2.0 board - - 2021-12-16T19:30:15.834+01:00 - 2021-12-16T19:30:29.447+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2021-12-16T19:30:47.185+01:00 - 2021-12-16T19:31:12.823+01:00 - - - - - - - - - - - - - - - - - - 000D6F000C869B61 - end_device - true - battery - - - - false - - - - - Plugwise B.V. - 143.1 - - - 2021-12-16T19:30:51.982+01:00 - 2021-12-18T10:33:32.029+01:00 - - - - - - - - - - - - - - - - - - - - - 0.0 - - - - - - Plugwise - 160-01 - - 2020-11-10T01:00:00+01:00 - - 2021-12-16T19:30:41.293+01:00 - 2023-12-17T09:31:18.033+01:00 - - - - - - - - - - - - - - - 000D6F000D13CA9A - router - true - mains - - - - 255 - 15 - None of the above - - - 255 - 15 - None of the above - - - 255 - 0 - None of the above - - - 2023-12-22T16:05:44+01:00 - true - - - - diff --git a/userdata/adam_zone_per_device/core.appliances.xml b/userdata/adam_zone_per_device/core.appliances.xml deleted file mode 100644 index 5f1628789..000000000 --- a/userdata/adam_zone_per_device/core.appliances.xml +++ /dev/null @@ -1,1543 +0,0 @@ - - - - Zone Lisa Bios - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2019-01-24T20:55:13.905+01:00 - 2020-03-20T18:24:13.392+01:00 - - - - - - 2020-03-20T18:24:13.382+01:00 - temperature - C - 2020-03-20T18:24:13.382+01:00 - - 16.50 - - - - - 2020-03-20T07:40:13.803+01:00 - battery - - 2020-03-15T19:54:42.318+01:00 - - 0.67 - - - - - 2020-03-20T08:22:10.252+01:00 - thermostat - C - 2020-03-19T08:25:49.033+01:00 - - 13.00 - - - - - 2020-01-30T17:35:06.817+01:00 - temperature_offset - C - 2019-01-24T20:55:28.943+01:00 - - 0.00 - - - - - - - 2020-03-20T08:22:10.252+01:00 - thermostat - 13 - 0 - 99.9 - 0.01 - - - - - - 2020-01-30T17:35:06.817+01:00 - temperature_offset - 0 - - - - - Floor kraan - 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 - 2019-01-14T16:45:47.777+01:00 - 2020-03-20T18:23:39.241+01:00 - - - - - - 2020-03-20T12:15:29.245+01:00 - valve_position - - 2020-03-20T12:15:29.245+01:00 - - 0.00 - - - - - 2020-03-20T18:23:39.237+01:00 - temperature_difference - C - 2020-03-20T18:23:39.237+01:00 - - 3.70 - - - - - 2020-03-20T18:22:06.448+01:00 - uncorrected_temperature - C - 2020-03-20T18:22:06.448+01:00 - - 26.03 - - - - - 2020-03-20T08:55:08.044+01:00 - thermostat - C - 2020-03-20T08:55:08.044+01:00 - - 21.50 - - - - - 2020-03-20T18:22:06.448+01:00 - temperature - C - 2020-03-20T18:22:06.448+01:00 - - 26.22 - - - - - 2019-12-24T21:47:20.951+01:00 - temperature_offset - C - 2019-01-14T16:45:58.634+01:00 - - 0.00 - - - - - - - - 2019-12-24T21:47:20.951+01:00 - temperature_offset - 0 - - - 2020-03-20T08:55:08.045+01:00 - thermostat - 21.5 - 0 - 99.99 - 0.01 - - - - - - - Bios Cv Thermostatic Radiator - 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 - 2019-01-24T20:53:13.633+01:00 - 2020-03-20T18:26:01.224+01:00 - - - - - - 2020-03-20T18:22:22.468+01:00 - uncorrected_temperature - C - 2020-03-20T18:22:22.468+01:00 - - 17.05 - - - - - 2020-02-16T18:48:56.608+01:00 - temperature_offset - C - 2019-01-24T20:53:33.959+01:00 - - 0.00 - - - - - 2020-03-20T18:26:01.210+01:00 - temperature_difference - C - 2020-03-20T18:26:01.210+01:00 - - -0.10 - - - - - 2020-03-20T18:22:22.468+01:00 - temperature - C - 2020-03-20T18:22:22.468+01:00 - - 17.05 - - - - - 2020-03-19T08:26:41.317+01:00 - thermostat - C - 2020-03-19T08:26:35.396+01:00 - - 13.00 - - - - - 2020-03-20T12:02:21.727+01:00 - valve_position - - 2020-03-15T00:48:58.016+01:00 - - 0.00 - - - - - 2020-03-20T14:21:55.399+01:00 - battery - - 2020-03-18T14:39:05.500+01:00 - - 0.62 - - - - - - - - 2020-02-16T18:48:56.608+01:00 - temperature_offset - 0 - - - 2020-03-19T08:26:41.317+01:00 - thermostat - 13 - 0 - 99.99 - 0.01 - - - - - - - Zone Lisa WK - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2019-01-14T16:59:21.855+01:00 - 2020-03-20T18:19:40.926+01:00 - - - - - - - - 2020-03-20T18:19:40.923+01:00 - temperature - C - 2020-03-20T18:19:40.923+01:00 - - 21.10 - - - - - 2020-03-20T08:55:11.798+01:00 - thermostat - C - 2020-03-20T08:55:11.706+01:00 - - 21.50 - - - - - 2020-03-20T15:51:12.192+01:00 - battery - - 2020-03-18T16:12:33.910+01:00 - - 0.34 - - - - - 2020-01-30T17:35:25.361+01:00 - temperature_offset - C - 2019-01-14T17:00:05.062+01:00 - - 0.00 - - - - - - - - 2020-01-30T17:35:25.361+01:00 - temperature_offset - 0 - - - 2020-03-20T08:55:11.798+01:00 - thermostat - 21.5 - 0 - 99.9 - 0.01 - - - - - - - Gateway D40FB201C949 - Container for variables logged about the Gateway in general. - gateway - 2018-10-29T14:06:47.624+01:00 - 2020-03-20T18:25:18.298+01:00 - - - - - 2020-03-20T18:25:18.261+01:00 - wlan_ip_address - - 2020-02-20T10:40:44+01:00 - - 127.0.0.1 - - - - - 2020-03-20T18:25:18.260+01:00 - signal_strength - dBm - 2020-03-20T18:25:18.260+01:00 - - -31.00 - - - - - 2020-03-20T18:25:17.203+01:00 - lan_state - - 2018-10-29T14:08:05.107+01:00 - - down - - - - - 2020-03-20T18:25:18.261+01:00 - wlan_state - - 2020-02-19T21:33:48.007+01:00 - - up - - - - - 2020-01-15T15:41:43.957+01:00 - regulation_mode - - - - heating - - - - - 2020-03-20T18:25:18.261+01:00 - link_quality - - 2020-03-20T00:39:40.480+01:00 - - 70 - - - - - - - - 2020-01-15T15:41:43.957+01:00 - regulation_mode - heating - - - - - Thermostatic Radiator Jessie - 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 - 2018-12-10T11:32:43.255+01:00 - 2020-03-20T18:18:32.685+01:00 - - - - - - 2020-03-20T17:06:16.944+01:00 - valve_position - - 2020-03-14T06:00:28.153+01:00 - - 0.00 - - - - - 2020-03-20T17:29:36.884+01:00 - temperature_difference - C - 2020-03-20T17:29:36.884+01:00 - - 0.10 - - - - - 2020-03-20T15:03:58.067+01:00 - battery - - 2020-03-20T15:03:58.067+01:00 - - 0.62 - - - - - 2020-03-20T18:18:32.679+01:00 - temperature - C - 2020-03-20T18:18:32.679+01:00 - - 16.86 - - - - - 2020-03-20T18:00:52.775+01:00 - thermostat - C - 2020-03-20T18:00:52.775+01:00 - - 16.00 - - - - - 2020-03-20T18:18:32.679+01:00 - uncorrected_temperature - C - 2020-03-20T18:18:32.679+01:00 - - 16.86 - - - - - 2020-03-15T00:49:52.744+01:00 - temperature_offset - C - 2018-12-10T11:33:37.483+01:00 - - 0.00 - - - - - - - 2020-03-20T18:00:52.776+01:00 - thermostat - 16 - 0 - 99.99 - 0.01 - - - - - - 2020-03-15T00:49:52.744+01:00 - temperature_offset - 0 - - - - - Playstation Smart Plug - A smart plug that can be switched on/off and measure power usage. - game_console - 2019-01-29T17:49:50.663+01:00 - 2020-03-20T18:26:11.718+01:00 - - - - - - 2020-03-20T18:24:14.308+01:00 - relay - - 2020-01-16T18:20:20.178+01:00 - - on - - - - - 2020-03-20T18:26:11.715+01:00 - electricity_produced - W - 2019-01-29T17:49:59.292+01:00 - - 0.00 - - - - - 2020-03-20T18:15:00+01:00 - electricity_produced - Wh - 2020-03-20T18:00:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T18:26:11.714+01:00 - electricity_consumed - W - 2020-03-20T18:26:11.714+01:00 - - 81.19 - - - - - 2020-03-20T18:15:00+01:00 - electricity_consumed - Wh - 2020-03-20T18:00:00+01:00 - PT15M - - 12.65 - - - - - - - 2020-03-20T18:24:14.308+01:00 - false - on - - - - - - CV Pomp - A smart plug that can be switched on/off and measure power usage. - central_heating_pump - 2019-01-14T16:46:50.396+01:00 - 2020-03-20T18:24:28.878+01:00 - - - - - - - - 2020-03-20T18:15:00+01:00 - electricity_consumed - Wh - 2020-03-20T18:00:00+01:00 - PT15M - - 5.85 - - - - - 2020-03-20T18:20:14.313+01:00 - electricity_consumed - W - 2020-03-20T18:20:14.313+01:00 - - 35.81 - - - - - 2020-03-20T18:19:57.706+01:00 - relay - - 2020-03-20T12:15:31.336+01:00 - - on - - - - - 2020-03-20T18:20:14.314+01:00 - electricity_produced - W - 2019-01-14T17:23:51.243+01:00 - - 0.00 - - - - - 2020-03-20T18:15:00+01:00 - electricity_produced - Wh - 2020-03-20T18:00:00+01:00 - PT15M - - 0.00 - - - - - - - 2020-03-20T18:19:57.706+01:00 - false - on - - - - - - Central heating boiler - - heater_central - 2018-12-10T10:20:01.020+01:00 - 2020-03-20T18:24:49.959+01:00 - - - - - 2020-03-20T18:24:05.812+01:00 - intended_boiler_temperature - C - 2020-03-20T12:15:31.267+01:00 - - 70.00 - - - - - 2020-03-20T12:15:31.288+01:00 - central_heating_state - - 2020-03-20T12:15:31.288+01:00 - - on - - - - - 2020-03-05T15:29:30.361+01:00 - modulation_level - - 2020-03-05T15:29:30.361+01:00 - - 0.01 - - - - - 2019-01-22T18:41:46.115+01:00 - heating_curve_high_setpoint - C - 2019-01-22T18:41:46.115+01:00 - - 70.00 - - - - - 2019-01-22T18:41:45.304+01:00 - heating_curve_low_setpoint - C - 2019-01-22T18:41:45.304+01:00 - - 70.00 - - - - - 2020-03-20T18:00:10.181+01:00 - boiler_temperature - C - 2020-03-20T18:00:10.181+01:00 - - 70.00 - - - - - - intended_central_heating_state - - - - - - 2020-03-20T18:00:00+01:00 - burner_operation_time - s - 2020-03-20T17:00:00+01:00 - PT1H - - 1489 - - - - - 2019-01-22T18:41:44.491+01:00 - heating_curve_high_temperature - C - 2019-01-22T18:41:44.491+01:00 - - 20.00 - - - - - 2019-01-22T18:41:43.681+01:00 - heating_curve_low_temperature - C - 2019-01-22T18:41:43.681+01:00 - - -10.00 - - - - - - - 2019-01-22T18:41:45.305+01:00 - heating_curve_low_setpoint - 70 - 10 - 90 - 1 - - - - - 2019-01-22T18:41:46.116+01:00 - heating_curve_high_setpoint - 70 - 20 - 90 - 1 - - - - - 2019-01-22T18:41:44.492+01:00 - heating_curve_high_temperature - 20 - 10 - 40 - 1 - - - - - 2019-01-22T18:41:43.682+01:00 - heating_curve_low_temperature - -10 - -30 - 10 - 1 - - - - - - - NAS - A smart plug that can be switched on/off and measure power usage. - vcr - 2019-01-21T17:45:53.949+01:00 - 2020-03-20T18:20:15.184+01:00 - - - - - - 2020-03-20T18:16:04.460+01:00 - relay - - 2019-08-24T11:31:08.308+02:00 - - on - - - - - 2020-03-20T18:14:19.963+01:00 - electricity_produced - W - 2019-01-22T18:25:46.592+01:00 - - 0.00 - - - - - 2020-03-20T18:15:00+01:00 - electricity_produced - Wh - 2020-03-20T18:00:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T18:14:19.962+01:00 - electricity_consumed - W - 2020-03-20T18:14:19.962+01:00 - - 16.50 - - - - - 2020-03-20T18:15:00+01:00 - electricity_consumed - Wh - 2020-03-20T18:00:00+01:00 - PT15M - - 0.29 - - - - - - - 2020-03-20T18:16:04.460+01:00 - true - on - - - - - - USG Smart Plug - A smart plug that can be switched on/off and measure power usage. - router - 2019-02-02T18:02:51.584+01:00 - 2020-03-20T18:23:23.759+01:00 - - - - - - 2020-03-20T18:12:13.058+01:00 - electricity_consumed - W - 2020-03-20T13:49:15.729+01:00 - - 8.50 - - - - - 2020-03-20T18:15:00+01:00 - electricity_produced - Wh - 2020-03-20T18:00:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T18:23:23.756+01:00 - relay - - 2019-05-08T22:06:24.076+02:00 - - on - - - - - 2020-03-20T18:15:00+01:00 - electricity_consumed - Wh - 2020-03-20T18:00:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T18:12:13.058+01:00 - electricity_produced - W - 2019-02-02T18:03:00.262+01:00 - - 0.00 - - - - - - - 2020-03-20T18:23:23.756+01:00 - true - on - - - - - - NVR - A smart plug that can be switched on/off and measure power usage. - vcr - 2019-01-21T17:39:23.813+01:00 - 2020-03-20T18:20:29.339+01:00 - - - - - - 2020-03-20T18:00:00+01:00 - electricity_produced - Wh - 2020-03-20T17:45:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T18:00:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:45:00+01:00 - PT15M - - 8.65 - - - - - 2020-03-20T18:10:15.670+01:00 - electricity_produced - W - 2019-01-21T17:39:27.592+01:00 - - 0.00 - - - - - 2020-03-20T18:10:15.670+01:00 - electricity_consumed - W - 2020-03-20T17:26:29.884+01:00 - - 34.00 - - - - - 2020-03-20T18:14:03.125+01:00 - relay - - 2019-05-08T13:37:31.544+02:00 - - on - - - - - - - 2020-03-20T18:14:03.125+01:00 - true - on - - - - - - Fibaro HC2 - A smart plug that can be switched on/off and measure power usage. - settop - 2019-01-07T15:49:37.213+01:00 - 2020-03-20T18:12:58.388+01:00 - - - - - - 2020-03-20T18:00:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:45:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T18:06:25.323+01:00 - electricity_consumed - W - 2020-03-20T17:37:18.064+01:00 - - 12.50 - - - - - 2020-03-20T18:00:00+01:00 - electricity_produced - Wh - 2020-03-20T17:45:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T18:06:25.323+01:00 - electricity_produced - W - 2019-01-14T17:23:45.546+01:00 - - 0.00 - - - - - 2020-03-20T18:12:58.386+01:00 - relay - - 2019-05-08T13:37:34.765+02:00 - - on - - - - - - - 2020-03-20T18:12:58.386+01:00 - true - on - - - - - - OpenThermGateway - An OpenTherm Gateway - open_therm_gateway - 2017-08-09T11:55:44.869+02:00 - 2019-01-14T17:23:38.116+01:00 - - - - - 2020-02-10T11:33:41.938+01:00 - open_therm_power_mode - - 2019-01-14T17:23:38.100+01:00 - - 0 - - - - - 2020-03-05T13:57:43.669+01:00 - override_mode - - 2018-10-29T14:06:47.288+01:00 - - on - - - - - - - - Zone Thermostat Jessie - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2019-01-25T17:46:40.150+01:00 - 2020-03-20T18:23:00.830+01:00 - - - - - - 2020-03-20T18:00:31.197+01:00 - thermostat - C - 2020-03-20T18:00:31.151+01:00 - - 16.00 - - - - - 2020-03-20T18:23:00.825+01:00 - temperature - C - 2020-03-20T18:23:00.825+01:00 - - 17.10 - - - - - 2020-03-20T12:02:38.943+01:00 - battery - - 2020-03-09T02:42:32.132+01:00 - - 0.37 - - - - - 2020-02-25T03:23:18.037+01:00 - temperature_offset - C - 2019-03-29T06:14:55.814+01:00 - - 0.00 - - - - - - - - 2020-02-25T03:23:18.037+01:00 - temperature_offset - 0 - - - 2020-03-20T18:00:31.197+01:00 - thermostat - 16 - 0 - 99.9 - 0.01 - - - - - - - Thermostatic Radiator Badkamer - 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 - 2018-12-10T10:52:45.271+01:00 - 2020-03-20T18:17:02.585+01:00 - - - - - - 2020-03-20T18:08:25.495+01:00 - temperature_difference - C - 2020-03-20T18:08:25.495+01:00 - - -0.30 - - - - - 2020-03-20T18:17:02.581+01:00 - uncorrected_temperature - C - 2020-03-20T18:02:37.841+01:00 - - 19.10 - - - - - 2020-03-20T18:17:02.580+01:00 - temperature - C - 2020-03-20T18:17:02.580+01:00 - - 19.10 - - - - - 2020-03-20T08:00:25.110+01:00 - valve_position - - 2020-03-20T08:00:25.110+01:00 - - 0.00 - - - - - 2020-03-20T08:00:13.116+01:00 - thermostat - C - 2020-03-20T08:00:13.116+01:00 - - 14.00 - - - - - 2020-01-30T17:35:08.840+01:00 - temperature_offset - C - 2018-12-10T11:08:44.085+01:00 - - 0.00 - - - - - 2020-03-20T16:25:26.889+01:00 - battery - - 2020-03-18T16:42:15.807+01:00 - - 0.51 - - - - - - - 2020-03-20T08:00:13.117+01:00 - thermostat - 14 - 0 - 99.99 - 0.01 - - - - - - 2020-01-30T17:35:08.840+01:00 - temperature_offset - 0 - - - - - Zone Thermostat Badkamer - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2019-01-25T08:21:56.648+01:00 - 2020-03-20T18:15:55.851+01:00 - - - - - - 2020-01-30T17:40:19.394+01:00 - temperature_offset - C - 2019-05-08T13:55:15.390+02:00 - - 0.00 - - - - - 2020-03-20T16:11:45.745+01:00 - battery - - 2020-03-18T04:23:07.035+01:00 - - 0.92 - - - - - 2020-03-20T18:15:55.848+01:00 - temperature - C - 2020-03-20T18:15:55.848+01:00 - - 18.80 - - - - - 2020-03-20T08:00:04.798+01:00 - thermostat - C - 2020-03-20T08:00:04.751+01:00 - - 14.00 - - - - - - - 2020-03-20T08:00:04.798+01:00 - thermostat - 14 - 0 - 99.9 - 0.01 - - - - - - 2020-01-30T17:40:19.394+01:00 - temperature_offset - 0 - - - - - Ziggo Modem - A smart plug that can be switched on/off and measure power usage. - router - 2019-01-30T08:12:35.240+01:00 - 2020-03-20T18:20:52.850+01:00 - - - - - - 2020-03-20T18:00:00+01:00 - electricity_produced - Wh - 2020-03-20T17:45:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T18:13:40.770+01:00 - relay - - 2019-05-08T13:36:33.221+02:00 - - on - - - - - 2020-03-20T18:00:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:45:00+01:00 - PT15M - - 2.80 - - - - - 2020-03-20T18:14:21.197+01:00 - electricity_produced - W - 2019-01-30T08:12:42.877+01:00 - - 0.00 - - - - - 2020-03-20T18:14:21.197+01:00 - electricity_consumed - W - 2020-03-20T14:05:41.152+01:00 - - 12.19 - - - - - - - 2020-03-20T18:13:40.770+01:00 - true - on - - - - - - CV Kraan Garage - 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 - 2019-01-21T19:14:50.095+01:00 - 2020-03-20T18:26:06.469+01:00 - - - - - - 2020-03-20T07:41:32.962+01:00 - battery - - 2020-03-16T19:28:48.366+01:00 - - 0.68 - - - - - 2020-03-20T18:09:37.319+01:00 - temperature_difference - C - 2020-03-20T18:09:31.288+01:00 - - 0.10 - - - - - 2020-03-20T18:26:06.465+01:00 - uncorrected_temperature - C - 2020-03-20T17:27:58.612+01:00 - - 15.60 - - - - - 2020-03-20T18:26:06.464+01:00 - temperature - C - 2020-03-20T18:26:06.464+01:00 - - 15.60 - - - - - 2020-03-20T07:50:13.375+01:00 - valve_position - - 2020-02-12T17:56:25.782+01:00 - - 0.00 - - - - - 2020-02-09T17:38:19.642+01:00 - temperature_offset - C - 2019-01-21T19:15:08.042+01:00 - - 0.00 - - - - - 2020-02-23T13:50:45.747+01:00 - thermostat - C - 2020-02-23T13:50:45.747+01:00 - - 5.50 - - - - - - - 2020-02-23T13:50:45.748+01:00 - thermostat - 5.5 - 0 - 99.99 - 0.01 - - - - - - 2020-02-09T17:38:19.642+01:00 - temperature_offset - 0 - - - - diff --git a/userdata/adam_zone_per_device/core.direct_objects.xml b/userdata/adam_zone_per_device/core.direct_objects.xml deleted file mode 100644 index 71913c3ef..000000000 --- a/userdata/adam_zone_per_device/core.direct_objects.xml +++ /dev/null @@ -1,2215 +0,0 @@ - - - - Floor kraan - 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 - 2019-01-14T16:45:47.777+01:00 - 2020-03-20T18:23:39.241+01:00 - - - - - - 2020-03-20T12:15:29.245+01:00 - valve_position - - 2020-03-20T12:15:29.245+01:00 - - 1.00 - - - - - 2020-03-20T18:23:39.237+01:00 - temperature_difference - C - 2020-03-20T18:23:39.237+01:00 - - 3.70 - - - - - 2020-03-20T18:22:06.448+01:00 - uncorrected_temperature - C - 2020-03-20T18:22:06.448+01:00 - - 26.03 - - - - - 2020-03-20T08:55:08.044+01:00 - thermostat - C - 2020-03-20T08:55:08.044+01:00 - - 21.50 - - - - - 2020-03-20T18:22:06.448+01:00 - temperature - C - 2020-03-20T18:22:06.448+01:00 - - 26.22 - - - - - 2019-12-24T21:47:20.951+01:00 - temperature_offset - C - 2019-01-14T16:45:58.634+01:00 - - 0.00 - - - - - - - - 2019-12-24T21:47:20.951+01:00 - temperature_offset - 0 - - - 2020-03-20T08:55:08.045+01:00 - thermostat - 21.5 - 0 - 99.99 - 0.01 - - - - - - - Bios Cv Thermostatic Radiator - 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 - 2019-01-24T20:53:13.633+01:00 - 2020-03-20T18:25:00.548+01:00 - - - - - - 2020-03-20T18:22:22.468+01:00 - uncorrected_temperature - C - 2020-03-20T18:22:22.468+01:00 - - 17.05 - - - - - 2020-02-16T18:48:56.608+01:00 - temperature_offset - C - 2019-01-24T20:53:33.959+01:00 - - 0.00 - - - - - 2020-03-20T18:25:00.544+01:00 - temperature_difference - C - 2020-03-20T18:25:00.544+01:00 - - 0.00 - - - - - 2020-03-20T18:22:22.468+01:00 - temperature - C - 2020-03-20T18:22:22.468+01:00 - - 17.05 - - - - - 2020-03-19T08:26:41.317+01:00 - thermostat - C - 2020-03-19T08:26:35.396+01:00 - - 13.00 - - - - - 2020-03-20T12:02:21.727+01:00 - valve_position - - 2020-03-15T00:48:58.016+01:00 - - 0.00 - - - - - 2020-03-20T14:21:55.399+01:00 - battery - - 2020-03-18T14:39:05.500+01:00 - - 0.62 - - - - - - - - 2020-02-16T18:48:56.608+01:00 - temperature_offset - 0 - - - 2020-03-19T08:26:41.317+01:00 - thermostat - 13 - 0 - 99.99 - 0.01 - - - - - - - Zone Lisa WK - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2019-01-14T16:59:21.855+01:00 - 2020-03-20T18:19:40.926+01:00 - - - - - - - - 2020-03-20T18:19:40.923+01:00 - temperature - C - 2020-03-20T18:19:40.923+01:00 - - 21.10 - - - - - 2020-03-20T08:55:11.798+01:00 - thermostat - C - 2020-03-20T08:55:11.706+01:00 - - 21.50 - - - - - 2020-03-20T15:51:12.192+01:00 - battery - - 2020-03-18T16:12:33.910+01:00 - - 0.34 - - - - - 2020-01-30T17:35:25.361+01:00 - temperature_offset - C - 2019-01-14T17:00:05.062+01:00 - - 0.00 - - - - - - - - 2020-01-30T17:35:25.361+01:00 - temperature_offset - 0 - - - 2020-03-20T08:55:11.798+01:00 - thermostat - 21.5 - 0 - 99.9 - 0.01 - - - - - - - Gateway D40FB201C949 - Container for variables logged about the Gateway in general. - gateway - 2018-10-29T14:06:47.624+01:00 - 2020-03-20T18:25:18.298+01:00 - - - - - 2020-03-20T18:25:18.261+01:00 - wlan_ip_address - - 2020-02-20T10:40:44+01:00 - - 127.0.0.1 - - - - - 2020-03-20T18:25:18.260+01:00 - signal_strength - dBm - 2020-03-20T18:25:18.260+01:00 - - -31.00 - - - - - 2020-03-20T18:25:17.203+01:00 - lan_state - - 2018-10-29T14:08:05.107+01:00 - - down - - - - - 2020-03-20T18:25:18.261+01:00 - wlan_state - - 2020-02-19T21:33:48.007+01:00 - - up - - - - - 2020-01-15T15:41:43.957+01:00 - regulation_mode - - - - heating - - - - - 2020-03-20T18:25:18.261+01:00 - link_quality - - 2020-03-20T00:39:40.480+01:00 - - 70 - - - - - - - - 2020-01-15T15:41:43.957+01:00 - regulation_mode - heating - - - - - Thermostatic Radiator Jessie - 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 - 2018-12-10T11:32:43.255+01:00 - 2020-03-20T18:18:32.685+01:00 - - - - - - 2020-03-20T17:06:16.944+01:00 - valve_position - - 2020-03-14T06:00:28.153+01:00 - - 0.00 - - - - - 2020-03-20T17:29:36.884+01:00 - temperature_difference - C - 2020-03-20T17:29:36.884+01:00 - - 0.10 - - - - - 2020-03-20T15:03:58.067+01:00 - battery - - 2020-03-20T15:03:58.067+01:00 - - 0.62 - - - - - 2020-03-20T18:18:32.679+01:00 - temperature - C - 2020-03-20T18:18:32.679+01:00 - - 16.86 - - - - - 2020-03-20T18:00:52.775+01:00 - thermostat - C - 2020-03-20T18:00:52.775+01:00 - - 16.00 - - - - - 2020-03-20T18:18:32.679+01:00 - uncorrected_temperature - C - 2020-03-20T18:18:32.679+01:00 - - 16.86 - - - - - 2020-03-15T00:49:52.744+01:00 - temperature_offset - C - 2018-12-10T11:33:37.483+01:00 - - 0.00 - - - - - - - 2020-03-20T18:00:52.776+01:00 - thermostat - 16 - 0 - 99.99 - 0.01 - - - - - - 2020-03-15T00:49:52.744+01:00 - temperature_offset - 0 - - - - - Systeem-3 - - system - 2020-03-20T18:18:51.764+01:00 - 2020-03-20T18:20:29.647+01:00 - - home - - - - - - - - relay - - - - - - electricity_consumed - W - - - - - electricity_produced - W - - - - - - - false - single - - - - - Home - - building - 2018-10-29T14:06:43.134+01:00 - 2020-03-20T18:14:48.343+01:00 - - home - - - - - 2020-03-20T18:14:47+01:00 - wind_vector - m_s - 2020-03-20T18:14:47+01:00 - - (7.20,40.00) - - - - - 2020-03-20T18:14:47+01:00 - outdoor_temperature - C - 2020-03-20T18:14:47+01:00 - - 7.69 - - - - - 2020-03-20T18:14:47+01:00 - solar_irradiance - W_m2 - 2020-03-20T18:14:47+01:00 - - 86.25 - - - - - 2020-03-20T18:14:47+01:00 - humidity - RH - 2020-03-20T18:14:47+01:00 - - 70.00 - - - - - 2020-03-20T18:14:47+01:00 - weather_description - - 2020-03-20T18:14:47+01:00 - - cloudy - - - - - - - - Central heating boiler - - heater_central - 2018-12-10T10:20:01.020+01:00 - 2020-03-20T18:24:49.959+01:00 - - - - - 2020-03-20T18:24:05.812+01:00 - intended_boiler_temperature - C - 2020-03-20T12:15:31.267+01:00 - - 70.00 - - - - - 2020-03-20T12:15:31.288+01:00 - central_heating_state - - 2020-03-20T12:15:31.288+01:00 - - on - - - - - 2020-03-05T15:29:30.361+01:00 - modulation_level - - 2020-03-05T15:29:30.361+01:00 - - 0.01 - - - - - 2019-01-22T18:41:46.115+01:00 - heating_curve_high_setpoint - C - 2019-01-22T18:41:46.115+01:00 - - 70.00 - - - - - 2019-01-22T18:41:45.304+01:00 - heating_curve_low_setpoint - C - 2019-01-22T18:41:45.304+01:00 - - 70.00 - - - - - 2020-03-20T18:00:10.181+01:00 - boiler_temperature - C - 2020-03-20T18:00:10.181+01:00 - - 70.00 - - - - - - intended_central_heating_state - - - - - - 2020-03-20T18:00:00+01:00 - burner_operation_time - s - 2020-03-20T17:00:00+01:00 - PT1H - - 1489 - - - - - 2019-01-22T18:41:44.491+01:00 - heating_curve_high_temperature - C - 2019-01-22T18:41:44.491+01:00 - - 20.00 - - - - - 2019-01-22T18:41:43.681+01:00 - heating_curve_low_temperature - C - 2019-01-22T18:41:43.681+01:00 - - -10.00 - - - - - - - 2019-01-22T18:41:45.305+01:00 - heating_curve_low_setpoint - 70 - 10 - 90 - 1 - - - - - 2019-01-22T18:41:46.116+01:00 - heating_curve_high_setpoint - 70 - 20 - 90 - 1 - - - - - 2019-01-22T18:41:44.492+01:00 - heating_curve_high_temperature - 20 - 10 - 40 - 1 - - - - - 2019-01-22T18:41:43.682+01:00 - heating_curve_low_temperature - -10 - -30 - 10 - 1 - - - - - - - NAS - A smart plug that can be switched on/off and measure power usage. - vcr - 2019-01-21T17:45:53.949+01:00 - 2020-03-20T18:20:15.184+01:00 - - - - - - 2020-03-20T18:16:04.460+01:00 - relay - - 2019-08-24T11:31:08.308+02:00 - - on - - - - - 2020-03-20T18:14:19.963+01:00 - electricity_produced - W - 2019-01-22T18:25:46.592+01:00 - - 0.00 - - - - - 2020-03-20T18:15:00+01:00 - electricity_produced - Wh - 2020-03-20T18:00:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T18:14:19.962+01:00 - electricity_consumed - W - 2020-03-20T18:14:19.962+01:00 - - 16.50 - - - - - 2020-03-20T18:15:00+01:00 - electricity_consumed - Wh - 2020-03-20T18:00:00+01:00 - PT15M - - 0.29 - - - - - - - 2020-03-20T18:16:04.460+01:00 - true - on - - - - - - Systeem-6 - - system - 2020-03-20T18:19:41.949+01:00 - 2020-03-20T18:20:53.199+01:00 - - home - - - - - - - - electricity_consumed - W - - - - - electricity_produced - W - - - - - relay - - - - - - - - false - single - - - - - Kantoor - - office - 2019-01-19T22:52:14.254+01:00 - 2019-01-30T09:05:45.161+01:00 - - home - - - - - 2019-01-30T08:24:56.135+01:00 - electricity_consumed - W - 2019-01-24T19:36:05.052+01:00 - - 12.69 - - - - - electricity_produced - W - - - - - - - Zone Thermostat Jessie - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2019-01-25T17:46:40.150+01:00 - 2020-03-20T18:23:00.830+01:00 - - - - - - 2020-03-20T18:00:31.197+01:00 - thermostat - C - 2020-03-20T18:00:31.151+01:00 - - 16.00 - - - - - 2020-03-20T18:23:00.825+01:00 - temperature - C - 2020-03-20T18:23:00.825+01:00 - - 17.10 - - - - - 2020-03-20T12:02:38.943+01:00 - battery - - 2020-03-09T02:42:32.132+01:00 - - 0.37 - - - - - 2020-02-25T03:23:18.037+01:00 - temperature_offset - C - 2019-03-29T06:14:55.814+01:00 - - 0.00 - - - - - - - - 2020-02-25T03:23:18.037+01:00 - temperature_offset - 0 - - - 2020-03-20T18:00:31.197+01:00 - thermostat - 16 - 0 - 99.9 - 0.01 - - - - - - - Bios - - guestroom - 2019-01-20T23:31:20.177+01:00 - 2020-03-20T18:24:13.407+01:00 - - away - - - - - - - - 2020-03-20T18:24:13.382+01:00 - temperature - C - 2020-03-05T15:07:18.483+01:00 - - 16.50 - - - - 2019-01-22T18:25:46.592+01:00 - electricity_produced - W - 2019-01-21T17:46:31.092+01:00 - - 0.00 - - - - 2019-01-30T09:04:56.705+01:00 - electricity_consumed - W - 2019-01-24T19:46:34.423+01:00 - - 0.00 - - - - 2020-03-19T08:25:49.033+01:00 - thermostat - C - 2020-03-02T23:06:16.280+01:00 - - 13.00 - - - - - - 2020-03-19T08:25:47.853+01:00 - thermostat - 13 - 0 - 99.99 - 0.01 - - false - true - - - - - Zone Lisa Bios - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2019-01-24T20:55:13.905+01:00 - 2020-03-20T18:24:13.392+01:00 - - - - - - 2020-03-20T18:24:13.382+01:00 - temperature - C - 2020-03-20T18:24:13.382+01:00 - - 16.50 - - - - - 2020-03-20T07:40:13.803+01:00 - battery - - 2020-03-15T19:54:42.318+01:00 - - 0.67 - - - - - 2020-03-20T08:22:10.252+01:00 - thermostat - C - 2020-03-19T08:25:49.033+01:00 - - 13.00 - - - - - 2020-01-30T17:35:06.817+01:00 - temperature_offset - C - 2019-01-24T20:55:28.943+01:00 - - 0.00 - - - - - - - 2020-03-20T08:22:10.252+01:00 - thermostat - 13 - 0 - 99.9 - 0.01 - - - - - - 2020-01-30T17:35:06.817+01:00 - temperature_offset - 0 - - - - - Systeem-5 - - system - 2020-03-20T18:19:24.842+01:00 - 2020-03-20T18:20:46.866+01:00 - - home - - - - - - - - electricity_produced - W - - - - - electricity_consumed - W - - - - - relay - - - - - - - - false - single - - - - - CV Kraan Garage - 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 - 2019-01-21T19:14:50.095+01:00 - 2020-03-20T18:11:34.524+01:00 - - - - - - 2020-03-20T07:41:32.962+01:00 - battery - - 2020-03-16T19:28:48.366+01:00 - - 0.68 - - - - - 2020-03-20T18:09:37.319+01:00 - temperature_difference - C - 2020-03-20T18:09:31.288+01:00 - - 0.10 - - - - - 2020-03-20T18:11:34.519+01:00 - uncorrected_temperature - C - 2020-03-20T17:27:58.612+01:00 - - 15.60 - - - - - 2020-03-20T18:11:34.518+01:00 - temperature - C - 2020-03-20T18:11:34.518+01:00 - - 15.60 - - - - - 2020-03-20T07:50:13.375+01:00 - valve_position - - 2020-02-12T17:56:25.782+01:00 - - 0.00 - - - - - 2020-02-09T17:38:19.642+01:00 - temperature_offset - C - 2019-01-21T19:15:08.042+01:00 - - 0.00 - - - - - 2020-02-23T13:50:45.747+01:00 - thermostat - C - 2020-02-23T13:50:45.747+01:00 - - 5.50 - - - - - - - 2020-02-23T13:50:45.748+01:00 - thermostat - 5.5 - 0 - 99.99 - 0.01 - - - - - - 2020-02-09T17:38:19.642+01:00 - temperature_offset - 0 - - - - - Vloerverwarming Woonkamer - - pumping - 2019-01-14T17:29:28.174+01:00 - 2020-03-20T18:20:14.345+01:00 - - - - - - - - 2020-03-20T18:19:40.923+01:00 - temperature - C - 2020-03-05T14:56:37.615+01:00 - - 21.10 - - - - - electricity_produced - W - - - - 2020-03-20T18:20:14.313+01:00 - electricity_consumed - W - 2020-03-05T15:01:16.100+01:00 - - 35.81 - - - - - - - false - single - - - - - Systeem-1 - - system - 2019-01-30T09:03:27.262+01:00 - 2020-03-20T18:20:07.015+01:00 - - home - - - - - - - - relay - - - - - 2020-03-20T18:20:04.920+01:00 - electricity_consumed - W - 2020-03-05T14:56:20.273+01:00 - - 80.69 - - - - 2019-02-02T18:03:46.127+01:00 - electricity_produced - W - - - 0.00 - - - - - - - false - single - - - - - Playstation Smart Plug - A smart plug that can be switched on/off and measure power usage. - game_console - 2019-01-29T17:49:50.663+01:00 - 2020-03-20T18:25:11.295+01:00 - - - - - - 2020-03-20T18:24:14.308+01:00 - relay - - 2020-01-16T18:20:20.178+01:00 - - on - - - - - 2020-03-20T18:25:11.286+01:00 - electricity_produced - W - 2019-01-29T17:49:59.292+01:00 - - 0.00 - - - - - 2020-03-20T18:15:00+01:00 - electricity_produced - Wh - 2020-03-20T18:00:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T18:25:11.285+01:00 - electricity_consumed - W - 2020-03-20T18:25:11.285+01:00 - - 79.63 - - - - - 2020-03-20T18:15:00+01:00 - electricity_consumed - Wh - 2020-03-20T18:00:00+01:00 - PT15M - - 12.65 - - - - - - - 2020-03-20T18:24:14.308+01:00 - false - on - - - - - - CV Pomp - A smart plug that can be switched on/off and measure power usage. - central_heating_pump - 2019-01-14T16:46:50.396+01:00 - 2020-03-20T18:24:28.878+01:00 - - - - - - - - 2020-03-20T18:15:00+01:00 - electricity_consumed - Wh - 2020-03-20T18:00:00+01:00 - PT15M - - 5.85 - - - - - 2020-03-20T18:20:14.313+01:00 - electricity_consumed - W - 2020-03-20T18:20:14.313+01:00 - - 35.81 - - - - - 2020-03-20T18:19:57.706+01:00 - relay - - 2020-03-20T12:15:31.336+01:00 - - on - - - - - 2020-03-20T18:20:14.314+01:00 - electricity_produced - W - 2019-01-14T17:23:51.243+01:00 - - 0.00 - - - - - 2020-03-20T18:15:00+01:00 - electricity_produced - Wh - 2020-03-20T18:00:00+01:00 - PT15M - - 0.00 - - - - - - - 2020-03-20T18:19:57.706+01:00 - false - on - - - - - - Garage - - garage - 2020-02-09T17:35:30.305+01:00 - 2020-03-20T18:11:34.536+01:00 - - no_frost - - - - - - - 2020-03-20T18:11:34.518+01:00 - temperature - C - 2020-03-05T15:05:44.130+01:00 - - 15.60 - - - - 2020-02-23T13:50:45.747+01:00 - thermostat - C - 2020-02-09T17:36:24.831+01:00 - - 5.50 - - - - - - 2020-02-23T13:50:45.748+01:00 - thermostat - 5.5 - 0 - 99.99 - 0.01 - - false - true - - - - - Systeem-2 - - system - 2020-03-20T18:18:23.922+01:00 - 2020-03-20T18:20:16.542+01:00 - - home - - - - - - - - electricity_produced - W - - - - - relay - - - - - 2020-03-20T18:20:15.529+01:00 - electricity_consumed - W - - - 16.50 - - - - - - - false - single - - - - - Badkamer - - bathroom - 2019-01-17T23:41:52.135+01:00 - 2020-03-20T18:15:55.861+01:00 - - away - - - - - - - - 2020-03-20T08:00:04.751+01:00 - thermostat - C - 2020-03-03T12:30:54.244+01:00 - - 14.00 - - - - 2020-03-20T18:15:55.848+01:00 - temperature - C - 2020-03-05T15:08:12.371+01:00 - - 18.80 - - - - - - 2020-03-20T08:00:02.888+01:00 - thermostat - 14 - 0 - 99.99 - 0.01 - - false - true - - - - - NVR - A smart plug that can be switched on/off and measure power usage. - vcr - 2019-01-21T17:39:23.813+01:00 - 2020-03-20T18:20:29.339+01:00 - - - - - - 2020-03-20T18:00:00+01:00 - electricity_produced - Wh - 2020-03-20T17:45:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T18:00:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:45:00+01:00 - PT15M - - 8.65 - - - - - 2020-03-20T18:10:15.670+01:00 - electricity_produced - W - 2019-01-21T17:39:27.592+01:00 - - 0.00 - - - - - 2020-03-20T18:10:15.670+01:00 - electricity_consumed - W - 2020-03-20T17:26:29.884+01:00 - - 34.00 - - - - - 2020-03-20T18:14:03.125+01:00 - relay - - 2019-05-08T13:37:31.544+02:00 - - on - - - - - - - 2020-03-20T18:14:03.125+01:00 - true - on - - - - - - Fibaro HC2 - A smart plug that can be switched on/off and measure power usage. - settop - 2019-01-07T15:49:37.213+01:00 - 2020-03-20T18:12:58.388+01:00 - - - - - - 2020-03-20T18:00:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:45:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T18:06:25.323+01:00 - electricity_consumed - W - 2020-03-20T17:37:18.064+01:00 - - 12.50 - - - - - 2020-03-20T18:00:00+01:00 - electricity_produced - Wh - 2020-03-20T17:45:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T18:06:25.323+01:00 - electricity_produced - W - 2019-01-14T17:23:45.546+01:00 - - 0.00 - - - - - 2020-03-20T18:12:58.386+01:00 - relay - - 2019-05-08T13:37:34.765+02:00 - - on - - - - - - - 2020-03-20T18:12:58.386+01:00 - true - on - - - - - - OpenThermGateway - An OpenTherm Gateway - open_therm_gateway - 2017-08-09T11:55:44.869+02:00 - 2019-01-14T17:23:38.116+01:00 - - - - - 2020-02-10T11:33:41.938+01:00 - open_therm_power_mode - - 2019-01-14T17:23:38.100+01:00 - - 0 - - - - - 2020-03-05T13:57:43.669+01:00 - override_mode - - 2018-10-29T14:06:47.288+01:00 - - on - - - - - - - - Systeem-4 - - system - 2020-03-20T18:19:08.390+01:00 - 2020-03-20T18:25:11.304+01:00 - - home - - - - - - - 2020-03-20T18:25:11.285+01:00 - electricity_consumed - W - - - 79.63 - - - - - relay - - - - - - electricity_produced - W - - - - - - - false - single - - - - - USG Smart Plug - A smart plug that can be switched on/off and measure power usage. - router - 2019-02-02T18:02:51.584+01:00 - 2020-03-20T18:23:23.759+01:00 - - - - - - 2020-03-20T18:12:13.058+01:00 - electricity_consumed - W - 2020-03-20T13:49:15.729+01:00 - - 8.50 - - - - - 2020-03-20T18:15:00+01:00 - electricity_produced - Wh - 2020-03-20T18:00:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T18:23:23.756+01:00 - relay - - 2019-05-08T22:06:24.076+02:00 - - on - - - - - 2020-03-20T18:15:00+01:00 - electricity_consumed - Wh - 2020-03-20T18:00:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T18:12:13.058+01:00 - electricity_produced - W - 2019-02-02T18:03:00.262+01:00 - - 0.00 - - - - - - - 2020-03-20T18:23:23.756+01:00 - true - on - - - - - - Ziggo Modem - A smart plug that can be switched on/off and measure power usage. - router - 2019-01-30T08:12:35.240+01:00 - 2020-03-20T18:20:52.850+01:00 - - - - - - 2020-03-20T18:00:00+01:00 - electricity_produced - Wh - 2020-03-20T17:45:00+01:00 - PT15M - - 0.00 - - - - - 2020-03-20T18:13:40.770+01:00 - relay - - 2019-05-08T13:36:33.221+02:00 - - on - - - - - 2020-03-20T18:00:00+01:00 - electricity_consumed - Wh - 2020-03-20T17:45:00+01:00 - PT15M - - 2.80 - - - - - 2020-03-20T18:14:21.197+01:00 - electricity_produced - W - 2019-01-30T08:12:42.877+01:00 - - 0.00 - - - - - 2020-03-20T18:14:21.197+01:00 - electricity_consumed - W - 2020-03-20T14:05:41.152+01:00 - - 12.19 - - - - - - - 2020-03-20T18:13:40.770+01:00 - true - on - - - - - - Zone Thermostat Badkamer - A zone thermostat regulates the temperature in a heating zone (generally a room). - zone_thermostat - 2019-01-25T08:21:56.648+01:00 - 2020-03-20T18:15:55.851+01:00 - - - - - - 2020-01-30T17:40:19.394+01:00 - temperature_offset - C - 2019-05-08T13:55:15.390+02:00 - - 0.00 - - - - - 2020-03-20T16:11:45.745+01:00 - battery - - 2020-03-18T04:23:07.035+01:00 - - 0.92 - - - - - 2020-03-20T18:15:55.848+01:00 - temperature - C - 2020-03-20T18:15:55.848+01:00 - - 18.80 - - - - - 2020-03-20T08:00:04.798+01:00 - thermostat - C - 2020-03-20T08:00:04.751+01:00 - - 14.00 - - - - - - - 2020-03-20T08:00:04.798+01:00 - thermostat - 14 - 0 - 99.9 - 0.01 - - - - - - 2020-01-30T17:40:19.394+01:00 - temperature_offset - 0 - - - - - Thermostatic Radiator Badkamer - 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 - 2018-12-10T10:52:45.271+01:00 - 2020-03-20T18:17:02.585+01:00 - - - - - - 2020-03-20T18:08:25.495+01:00 - temperature_difference - C - 2020-03-20T18:08:25.495+01:00 - - -0.30 - - - - - 2020-03-20T18:17:02.581+01:00 - uncorrected_temperature - C - 2020-03-20T18:02:37.841+01:00 - - 19.10 - - - - - 2020-03-20T18:17:02.580+01:00 - temperature - C - 2020-03-20T18:17:02.580+01:00 - - 19.10 - - - - - 2020-03-20T08:00:25.110+01:00 - valve_position - - 2020-03-20T08:00:25.110+01:00 - - 0.00 - - - - - 2020-03-20T08:00:13.116+01:00 - thermostat - C - 2020-03-20T08:00:13.116+01:00 - - 14.00 - - - - - 2020-01-30T17:35:08.840+01:00 - temperature_offset - C - 2018-12-10T11:08:44.085+01:00 - - 0.00 - - - - - 2020-03-20T16:25:26.889+01:00 - battery - - 2020-03-18T16:42:15.807+01:00 - - 0.51 - - - - - - - 2020-03-20T08:00:13.117+01:00 - thermostat - 14 - 0 - 99.99 - 0.01 - - - - - - 2020-01-30T17:35:08.840+01:00 - temperature_offset - 0 - - - - - Jessie - - bedroom - 2019-01-25T17:08:54.204+01:00 - 2020-03-20T18:23:00.852+01:00 - - asleep - - - - - - - - 2020-03-20T18:00:31.151+01:00 - thermostat - C - 2020-03-05T07:15:05.786+01:00 - - 16.00 - - - - 2020-03-20T18:23:00.825+01:00 - temperature - C - 2020-03-05T15:06:28.158+01:00 - - 17.10 - - - - - - 2020-03-20T18:00:29.876+01:00 - thermostat - 16 - 0 - 99.99 - 0.01 - - false - true - - - - - Woonkamer - - livingroom - 2019-01-14T16:45:34.964+01:00 - 2020-03-20T18:20:14.331+01:00 - - home - - - - - - - - - 2020-03-20T08:55:11.706+01:00 - thermostat - C - 2020-03-05T15:00:07.102+01:00 - - 21.50 - - - - - relay - - - - - 2020-03-20T18:20:14.313+01:00 - electricity_consumed - W - 2020-03-05T15:01:16.100+01:00 - - 35.81 - - - - 2019-07-08T18:07:07.272+02:00 - electricity_produced - W - 2019-04-08T17:43:57.736+02:00 - - 0.00 - - - - 2020-03-20T18:19:40.923+01:00 - temperature - C - 2020-03-05T14:56:37.615+01:00 - - 21.10 - - - - - - - false - single - - - 2020-03-20T08:55:06.281+01:00 - thermostat - 21.5 - 0 - 99.99 - 0.01 - - false - true - - - - diff --git a/userdata/adam_zone_per_device/core.locations.xml b/userdata/adam_zone_per_device/core.locations.xml deleted file mode 100644 index 5d94e2202..000000000 --- a/userdata/adam_zone_per_device/core.locations.xml +++ /dev/null @@ -1,630 +0,0 @@ - - - - Garage - - garage - 2020-02-09T17:35:30.305+01:00 - 2020-03-20T18:11:34.536+01:00 - - no_frost - - - - - - - 2020-03-20T18:11:34.518+01:00 - temperature - C - 2020-03-05T15:05:44.130+01:00 - - 15.60 - - - - 2020-02-23T13:50:45.747+01:00 - thermostat - C - 2020-02-09T17:36:24.831+01:00 - - 5.50 - - - - - - 2020-02-23T13:50:45.748+01:00 - thermostat - 5.5 - 0 - 99.99 - 0.01 - - false - true - - - - - Systeem-2 - - system - 2020-03-20T18:18:23.922+01:00 - 2020-03-20T18:20:16.542+01:00 - - home - - - - - - - - electricity_produced - W - - - - - relay - - - - - 2020-03-20T18:20:15.529+01:00 - electricity_consumed - W - - - 16.50 - - - - - - - false - single - - - - - Badkamer - - bathroom - 2019-01-17T23:41:52.135+01:00 - 2020-03-20T18:15:55.861+01:00 - - away - - - - - - - - 2020-03-20T08:00:04.751+01:00 - thermostat - C - 2020-03-03T12:30:54.244+01:00 - - 14.00 - - - - 2020-03-20T18:15:55.848+01:00 - temperature - C - 2020-03-05T15:08:12.371+01:00 - - 18.80 - - - - - - 2020-03-20T08:00:02.888+01:00 - thermostat - 14 - 0 - 99.99 - 0.01 - - false - true - - - - - Systeem-4 - - system - 2020-03-20T18:19:08.390+01:00 - 2020-03-20T18:25:11.304+01:00 - - home - - - - - - - 2020-03-20T18:25:11.285+01:00 - electricity_consumed - W - - - 79.63 - - - - - relay - - - - - - electricity_produced - W - - - - - - - false - single - - - - - Systeem-6 - - system - 2020-03-20T18:19:41.949+01:00 - 2020-03-20T18:20:53.199+01:00 - - home - - - - - - - - electricity_consumed - W - - - - - electricity_produced - W - - - - - relay - - - - - - - - false - single - - - - - Jessie - - bedroom - 2019-01-25T17:08:54.204+01:00 - 2020-03-20T18:23:00.852+01:00 - - asleep - - - - - - - - 2020-03-20T18:00:31.151+01:00 - thermostat - C - 2020-03-05T07:15:05.786+01:00 - - 16.00 - - - - 2020-03-20T18:23:00.825+01:00 - temperature - C - 2020-03-05T15:06:28.158+01:00 - - 17.10 - - - - - - 2020-03-20T18:00:29.876+01:00 - thermostat - 16 - 0 - 99.99 - 0.01 - - false - true - - - - - Kantoor - - office - 2019-01-19T22:52:14.254+01:00 - 2019-01-30T09:05:45.161+01:00 - - home - - - - - 2019-01-30T08:24:56.135+01:00 - electricity_consumed - W - 2019-01-24T19:36:05.052+01:00 - - 12.69 - - - - - electricity_produced - W - - - - - - - Home - - building - 2018-10-29T14:06:43.134+01:00 - 2020-03-20T18:14:48.343+01:00 - - home - - - - - 2020-03-20T18:14:47+01:00 - wind_vector - m_s - 2020-03-20T18:14:47+01:00 - - (7.20,40.00) - - - - - 2020-03-20T18:14:47+01:00 - outdoor_temperature - C - 2020-03-20T18:14:47+01:00 - - 7.69 - - - - - 2020-03-20T18:14:47+01:00 - solar_irradiance - W_m2 - 2020-03-20T18:14:47+01:00 - - 86.25 - - - - - 2020-03-20T18:14:47+01:00 - humidity - RH - 2020-03-20T18:14:47+01:00 - - 70.00 - - - - - 2020-03-20T18:14:47+01:00 - weather_description - - 2020-03-20T18:14:47+01:00 - - cloudy - - - - - - - - Systeem-1 - - system - 2019-01-30T09:03:27.262+01:00 - 2020-03-20T18:20:07.015+01:00 - - home - - - - - - - - relay - - - - - 2020-03-20T18:20:04.920+01:00 - electricity_consumed - W - 2020-03-05T14:56:20.273+01:00 - - 80.69 - - - - 2019-02-02T18:03:46.127+01:00 - electricity_produced - W - - - 0.00 - - - - - - - false - single - - - - - Bios - - guestroom - 2019-01-20T23:31:20.177+01:00 - 2020-03-20T18:24:13.407+01:00 - - away - - - - - - - - 2020-03-20T18:24:13.382+01:00 - temperature - C - 2020-03-05T15:07:18.483+01:00 - - 16.50 - - - - 2019-01-22T18:25:46.592+01:00 - electricity_produced - W - 2019-01-21T17:46:31.092+01:00 - - 0.00 - - - - 2019-01-30T09:04:56.705+01:00 - electricity_consumed - W - 2019-01-24T19:46:34.423+01:00 - - 0.00 - - - - 2020-03-19T08:25:49.033+01:00 - thermostat - C - 2020-03-02T23:06:16.280+01:00 - - 13.00 - - - - - - 2020-03-19T08:25:47.853+01:00 - thermostat - 13 - 0 - 99.99 - 0.01 - - false - true - - - - - Systeem-5 - - system - 2020-03-20T18:19:24.842+01:00 - 2020-03-20T18:20:46.866+01:00 - - home - - - - - - - - electricity_produced - W - - - - - electricity_consumed - W - - - - - relay - - - - - - - - false - single - - - - - Systeem-3 - - system - 2020-03-20T18:18:51.764+01:00 - 2020-03-20T18:20:29.647+01:00 - - home - - - - - - - - relay - - - - - - electricity_consumed - W - - - - - electricity_produced - W - - - - - - - false - single - - - - - Woonkamer - - livingroom - 2019-01-14T16:45:34.964+01:00 - 2020-03-20T18:20:14.331+01:00 - - home - - - - - - - - - 2020-03-20T08:55:11.706+01:00 - thermostat - C - 2020-03-05T15:00:07.102+01:00 - - 21.50 - - - - - relay - - - - - 2020-03-20T18:20:14.313+01:00 - electricity_consumed - W - 2020-03-05T15:01:16.100+01:00 - - 35.81 - - - - 2019-07-08T18:07:07.272+02:00 - electricity_produced - W - 2019-04-08T17:43:57.736+02:00 - - 0.00 - - - - 2020-03-20T18:19:40.923+01:00 - temperature - C - 2020-03-05T14:56:37.615+01:00 - - 21.10 - - - - - - - false - single - - - 2020-03-20T08:55:06.281+01:00 - thermostat - 21.5 - 0 - 99.99 - 0.01 - - false - true - - - - diff --git a/userdata/adam_zone_per_device/core.modules.xml b/userdata/adam_zone_per_device/core.modules.xml deleted file mode 100644 index 765df9aaa..000000000 --- a/userdata/adam_zone_per_device/core.modules.xml +++ /dev/null @@ -1,746 +0,0 @@ - - - - Plugwise - 158-01 - 255 - 2016-10-27T02:00:00+02:00 - 2019-01-25T17:46:39.267+01:00 - 2019-01-25T17:53:34.957+01:00 - - - - - - - - - - - - - - - - - - ABCD012345670A03 - end_device - true - battery - - - - - - - Plugwise - 106-03 - 1 - 2019-03-27T01:00:00+01:00 - 2019-01-23T18:55:54.552+01:00 - 2020-01-15T15:43:07.112+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - ABCD012345670A09 - end_device - true - battery - - - - - - - Plugwise - Gateway - AME Smile 2.0 board - - 2018-10-29T14:06:41.297+01:00 - 2020-01-15T15:41:42.938+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - 160-01 - - 2016-12-01T01:00:00+01:00 - 2019-01-07T15:49:36.790+01:00 - 2020-01-15T18:06:52.761+01:00 - - - - - - - - - ABCD012345670A04 - router - false - mains - - - - - - - Plugwise - 106-03 - 1 - 2019-03-27T01:00:00+01:00 - 2018-12-10T11:32:41.282+01:00 - 2020-01-15T15:42:34.628+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - ABCD012345670A10 - end_device - true - battery - - - - - - - - 159.1 - - - 2017-08-09T11:55:57.154+02:00 - 2018-10-29T14:06:59.466+01:00 - - - - - 0.0 - - - - - - Plugwise - 160-01 - - 2019-06-21T02:00:00+02:00 - 2019-01-21T17:45:53.497+01:00 - 2020-01-15T16:40:16.140+01:00 - - - - - - - - - - - - - - - ABCD012345670A14 - router - true - mains - - - - - - - Plugwise - 160-01 - - 2019-06-21T02:00:00+02:00 - 2019-01-14T16:46:49.917+01:00 - 2020-01-15T16:16:01.164+01:00 - - - - - - - - - - - - - - - ABCD012345670A05 - router - true - mains - - - - - - - - - - - 2018-10-29T14:06:42.721+01:00 - 2020-01-15T15:43:09.591+01:00 - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - 106-03 - 1 - 2019-03-27T01:00:00+01:00 - 2019-01-21T19:14:49.122+01:00 - 2020-02-09T17:35:41.864+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - ABCD012345670A11 - end_device - true - battery - - - - - - - Plugwise - 160-01 - - 2019-06-21T02:00:00+02:00 - 2019-02-02T18:02:50.749+01:00 - 2020-01-15T16:23:31.154+01:00 - - - - - - - - - - - - - - - ABCD012345670A16 - router - true - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-27T02:00:00+02:00 - 2019-01-23T20:12:00.726+01:00 - 2020-02-10T11:34:23.484+01:00 - - - - - - - - - - - - - - - - - - ABCD012345670A06 - end_device - true - battery - - - - - - - - - - - 2018-12-10T10:19:57.378+01:00 - 2020-01-15T15:41:43.917+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - 106-03 - 1 - 2019-03-27T01:00:00+01:00 - 2019-01-14T16:45:47.254+01:00 - 2020-01-15T15:42:41.152+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - ABCD012345670A02 - router - true - mains - - - - - - - Plugwise - 160-01 - - 2019-06-21T02:00:00+02:00 - 2019-01-29T17:49:50.327+01:00 - 2020-01-15T15:59:49.050+01:00 - - - - - - - - - - - - - - - ABCD012345670A12 - router - true - mains - - - - - - - Plugwise - 160-01 - - 2019-06-21T02:00:00+02:00 - 2019-01-07T15:49:36.217+01:00 - 2020-01-15T16:31:40.849+01:00 - - - - - - - - - - - - - - - ABCD012345670A13 - router - true - mains - - - - - - - Plugwise - Adam - 6539-1601-4502 - 2018-10-30T10:12:41+01:00 - 2017-08-09T11:55:44.017+02:00 - 2019-01-14T17:24:37.209+01:00 - - - - - - - - - - - - 17-11-001-948 - - - - - - - Plugwise - 106-03 - 1 - 2019-03-27T01:00:00+01:00 - 2018-12-10T10:52:44.276+01:00 - 2020-01-15T15:42:32.931+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - ABCD012345670A17 - end_device - true - battery - - - - - - - Plugwise - 158-01 - 255 - 2016-08-02T02:00:00+02:00 - 2019-01-14T16:59:19.417+01:00 - 2020-02-10T11:34:29.122+01:00 - - - - - - - - - - - - - - - - - - ABCD012345670A07 - end_device - true - battery - - - - - - - Telegesis - ETRX3USB - - - 2018-10-29T14:06:55.131+01:00 - 2018-10-29T14:06:55.266+01:00 - - - - - ABCD012345670101 - false - - - - - - - Plugwise - 160-01 - - 2019-06-21T02:00:00+02:00 - 2019-01-21T17:39:23.431+01:00 - 2020-01-15T16:07:46.499+01:00 - - - - - - - - - - - - - - - ABCD012345670A15 - router - true - mains - - - - - - - Plugwise - 160-01 - - 2019-06-21T02:00:00+02:00 - 2019-01-30T08:12:34.679+01:00 - 2020-01-15T15:51:20.214+01:00 - - - - - - - - - - - - - - - ABCD012345670A01 - router - true - mains - - - - - - - Plugwise - 158-01 - 255 - 2016-10-27T02:00:00+02:00 - 2019-01-23T18:15:08.710+01:00 - 2020-02-10T11:34:32.225+01:00 - - - - - - - - - - - - - - - - - - ABCD012345670A08 - end_device - true - battery - - - - - - diff --git a/userdata/anna_connected_to_adam/core.appliances.xml b/userdata/anna_connected_to_adam/core.appliances.xml deleted file mode 100644 index 9eecd1fcb..000000000 --- a/userdata/anna_connected_to_adam/core.appliances.xml +++ /dev/null @@ -1,546 +0,0 @@ - - - - Anna - A thermostat - thermostat - 2021-12-18T11:59:12.890+01:00 - 2022-03-10T18:57:44.415+01:00 - - - - - - 2022-03-10T17:15:30.405+01:00 - intended_domestic_hot_water_comfort_mode - - 2021-12-18T12:00:59.528+01:00 - - off - - - - - 2022-03-10T18:31:29+01:00 - cpu_frequency - Hz - 2022-03-10T18:31:29+01:00 - - 8000000 - - - - - 2021-12-28T07:03:36.718+01:00 - temperature_offset - C - 2021-12-24T10:16:03.012+01:00 - - -0.30 - - - - - 2022-03-10T18:53:43.217+01:00 - temperature - C - 2022-03-10T18:51:47.685+01:00 - - 19.46 - - - - - 2022-03-10T18:57:44.411+01:00 - illuminance - lx - 2022-03-10T18:57:44.411+01:00 - - 1.75 - - - - - 2022-02-10T13:03:48.725+01:00 - button_left - - 2022-02-10T13:03:48.725+01:00 - - up - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/userdata/anna_elga_2/core.appliances.xml b/userdata/anna_elga_2/core.appliances.xml deleted file mode 100644 index 7f76c04a6..000000000 --- a/userdata/anna_elga_2/core.appliances.xml +++ /dev/null @@ -1,1333 +0,0 @@ - - - - Anna - A thermostat - thermostat - 2019-07-22T11:03:36.852+02:00 - 2022-03-10T19:01:01.334+01:00 - - - - - - temperature_offset - C - 2022-03-02T17:48:18.308+01:00 - 2019-07-22T11:08:14.705+02:00 - - - - 0.00 - - - - open_therm_boiler_activation_threshold - C - 2022-03-02T17:48:18.199+01:00 - 2020-07-09T16:11:46.259+02:00 - - - - 0.00 - - - - decentral_heat_demand_offset - C - 2022-03-10T19:01:39.262+01:00 - 2020-08-15T17:11:15.017+02:00 - - - - 0.00 - - - - proximity_detection - - 2021-11-20T23:26:01.029+01:00 - 2021-11-20T23:26:01.029+01:00 - - - - proximity_detected - - - - cooling_deactivation_threshold - C - 2020-09-07T19:07:13.679+02:00 - 2020-09-07T19:07:13.679+02:00 - - - - 3 - - - - derivative_coefficient - s - 2022-03-02T17:48:18.207+01:00 - 2020-07-10T05:28:54.022+02:00 - - - - 0 - - - - button_left - - 2022-03-09T18:38:03.814+01:00 - 2022-03-09T18:38:03.814+01:00 - - - - - - - - - - - - - - - - - - - - - - - - 2017-10-25T14:55:02.841+02:00 - 2020-07-10T05:28:40.857+02:00 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/userdata/anna_elga_2_cooling/core.appliances.xml b/userdata/anna_elga_2_cooling/core.appliances.xml deleted file mode 100644 index dfc583259..000000000 --- a/userdata/anna_elga_2_cooling/core.appliances.xml +++ /dev/null @@ -1,1350 +0,0 @@ - - - - Anna - A thermostat - thermostat - 2019-07-22T11:03:36.852+02:00 - 2022-03-10T19:01:01.334+01:00 - - - - - - temperature_offset - C - 2022-03-02T17:48:18.308+01:00 - 2019-07-22T11:08:14.705+02:00 - - - - 0.00 - - - - open_therm_boiler_activation_threshold - C - 2022-03-02T17:48:18.199+01:00 - 2020-07-09T16:11:46.259+02:00 - - - - 0.00 - - - - decentral_heat_demand_offset - C - 2022-03-10T19:01:39.262+01:00 - 2020-08-15T17:11:15.017+02:00 - - - - 0.00 - - - - proximity_detection - - 2021-11-20T23:26:01.029+01:00 - 2021-11-20T23:26:01.029+01:00 - - - - proximity_detected - - - - cooling_deactivation_threshold - C - 2020-09-07T19:07:13.679+02:00 - 2020-09-07T19:07:13.679+02:00 - - - - 3 - - - - derivative_coefficient - s - 2022-03-02T17:48:18.207+01:00 - 2020-07-10T05:28:54.022+02:00 - - - - 0 - - - - button_left - - 2022-03-09T18:38:03.814+01:00 - 2022-03-09T18:38:03.814+01:00 - - - - - - - - - - - - - - - - - - - - - - - - 2017-10-25T14:55:02.841+02:00 - 2020-07-10T05:28:40.857+02:00 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/userdata/anna_elga_2_schedule_off/core.appliances.xml b/userdata/anna_elga_2_schedule_off/core.appliances.xml deleted file mode 100644 index 7f76c04a6..000000000 --- a/userdata/anna_elga_2_schedule_off/core.appliances.xml +++ /dev/null @@ -1,1333 +0,0 @@ - - - - Anna - A thermostat - thermostat - 2019-07-22T11:03:36.852+02:00 - 2022-03-10T19:01:01.334+01:00 - - - - - - temperature_offset - C - 2022-03-02T17:48:18.308+01:00 - 2019-07-22T11:08:14.705+02:00 - - - - 0.00 - - - - open_therm_boiler_activation_threshold - C - 2022-03-02T17:48:18.199+01:00 - 2020-07-09T16:11:46.259+02:00 - - - - 0.00 - - - - decentral_heat_demand_offset - C - 2022-03-10T19:01:39.262+01:00 - 2020-08-15T17:11:15.017+02:00 - - - - 0.00 - - - - proximity_detection - - 2021-11-20T23:26:01.029+01:00 - 2021-11-20T23:26:01.029+01:00 - - - - proximity_detected - - - - cooling_deactivation_threshold - C - 2020-09-07T19:07:13.679+02:00 - 2020-09-07T19:07:13.679+02:00 - - - - 3 - - - - derivative_coefficient - s - 2022-03-02T17:48:18.207+01:00 - 2020-07-10T05:28:54.022+02:00 - - - - 0 - - - - button_left - - 2022-03-09T18:38:03.814+01:00 - 2022-03-09T18:38:03.814+01:00 - - - - - - - - - - - - - - - - - - - - - - - - 2017-10-25T14:55:02.841+02:00 - 2020-07-10T05:28:40.857+02:00 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/userdata/anna_elga_no_cooling/core.appliances.xml b/userdata/anna_elga_no_cooling/core.appliances.xml deleted file mode 100644 index 80890b927..000000000 --- a/userdata/anna_elga_no_cooling/core.appliances.xml +++ /dev/null @@ -1,1294 +0,0 @@ - - - - Central heating boiler - - heater_central - 2019-08-29T20:18:24.141+02:00 - 2020-04-09T14:10:05.574+02:00 - - - - - 2020-04-01T01:29:31.824+02:00 - night_reduction - - 2019-08-29T20:59:52.274+02:00 - - on - - - - - 2020-04-01T01:29:31.674+02:00 - first_fan_enabled - - 2019-08-29T20:19:52.760+02:00 - - off - - - - - 2020-04-09T13:25:18.838+02:00 - hibernation_lead_time - hr - 2020-04-01T01:33:42.860+02:00 - - 10 - - - - - 2020-04-01T01:29:31.818+02:00 - boiler_enabled - - 2019-08-31T09:39:37.817+02:00 - - off - - - - - 2020-04-09T14:09:54.218+02:00 - slave_boiler_state - - 2020-04-01T09:24:19.878+02:00 - - off - - - - - 2020-04-09T14:10:05.571+02:00 - domestic_hot_water_temperature - C - 2020-04-09T14:10:05.571+02:00 - - 46.34 - - - - - 2020-04-09T13:25:35.107+02:00 - maximum_outdoor_unit_power_increase_temperature - C - 2020-04-01T01:33:43.584+02:00 - - 43.00 - - - - - 2020-04-09T14:08:11.233+02:00 - return_water_temperature - C - 2020-04-09T14:08:11.233+02:00 - - 25.09 - - - - - 2020-04-01T01:29:31.810+02:00 - thermostat_supports_cooling - - 2019-09-03T13:09:35.966+02:00 - - off - - - - - 2020-04-01T01:29:31.643+02:00 - input_contacts_installed - - 2019-08-29T20:19:45.527+02:00 - - on - - - - - 2020-04-09T14:09:02.597+02:00 - boiler_temperature - C - 2020-04-09T14:09:02.597+02:00 - - 29.09 - - - - - 2020-04-01T01:29:31.830+02:00 - underfloor_heating - - 2019-08-29T20:19:42.677+02:00 - - on - - - - - 2020-04-09T13:25:27.332+02:00 - weather_dependent_maximum_supply_temperature - C - 2019-08-29T20:19:22.989+02:00 - - 60.00 - - - - - - temperature - C - - - - - 2020-04-09T13:25:20.096+02:00 - maximum_heating_supply_temperature - C - 2019-08-29T20:29:35.116+02:00 - - 40.00 - - - - - 2020-04-09T13:25:31.429+02:00 - maximum_outdoor_unit_temperature - C - 2019-08-29T20:19:21.338+02:00 - - 47.00 - - - - - 2020-04-01T01:29:31.692+02:00 - boiler_installed - - 2019-08-29T20:19:54.246+02:00 - - on - - - - - 2020-04-09T13:25:30.736+02:00 - internal_pump_heating_lead_time - s - 2019-08-29T20:18:54.646+02:00 - - 60 - - - - - 2020-04-01T01:29:31.664+02:00 - temperature_sensor_enabled - - 2019-08-29T20:19:49.846+02:00 - - off - - - - - 2020-04-01T01:29:31.652+02:00 - second_fan_enabled - - 2019-08-29T20:19:48.386+02:00 - - off - - - - - 2020-04-09T13:33:10+02:00 - burner_efficiency - s - 2020-04-09T13:33:10+02:00 - - 7372 - - - - - 2020-04-09T13:25:19.455+02:00 - minimum_boiler_run_time - s - 2020-04-01T01:33:43.099+02:00 - - 20 - - - - - 2020-04-08T22:30:51.045+02:00 - cooling_state - - 2020-04-08T22:30:51.045+02:00 - - off - - - - - 2020-04-09T14:06:36.049+02:00 - outdoor_temperature - C - 2020-04-09T13:51:55.147+02:00 - - 3.00 - - - - - 2020-04-09T13:25:30.119+02:00 - boiler_activation_threshold - Cmin - 2020-04-01T01:33:44.534+02:00 - - 30 - - - - - 2020-04-09T13:27:29.096+02:00 - flame_state - - 2020-04-09T13:27:29.096+02:00 - - off - - - - - 2020-04-01T01:29:31.806+02:00 - thermostat_enabled - - 2019-08-29T20:19:33.125+02:00 - - off - - - - - 2020-04-09T13:25:31.144+02:00 - cooling_lower_offset - C - 2019-08-29T20:19:05.905+02:00 - - 1.00 - - - - - 2020-04-01T01:29:31.670+02:00 - serial_boiler_installation - - 2019-08-29T20:19:51.287+02:00 - - off - - - - - 2020-04-08T19:24:39.363+02:00 - intended_boiler_temperature - C - 2020-04-03T07:54:47.729+02:00 - - 35.00 - - - - - 2020-04-09T14:09:54.416+02:00 - compressor_state - - 2020-04-09T12:47:28.377+02:00 - - on - - - - - 2020-04-09T13:27:29.089+02:00 - domestic_hot_water_state - - 2020-04-09T13:27:29.089+02:00 - - off - - - - - 2020-04-08T19:24:38.964+02:00 - maximum_boiler_temperature - C - 2020-04-01T01:33:34.763+02:00 - - 60.00 - - - - - 2020-04-01T01:29:31.630+02:00 - weather_dependent_regulation - - 2019-08-29T20:19:44.096+02:00 - - off - - - - - 2020-04-09T13:25:30.965+02:00 - minimum_cooling_supply_temperature - C - 2020-04-01T01:33:41.488+02:00 - - 17.00 - - - - - 2020-04-09T14:10:17.399+02:00 - refrigerent_out_temperature - C - 2020-04-08T19:24:42.196+02:00 - - 0.00 - - - - - 2020-04-08T19:24:38.879+02:00 - open_therm_application_specific_fault_code - - 2019-08-29T20:18:32.180+02:00 - - 0 - - - - - 2020-04-09T13:25:35.453+02:00 - cooling_upper_offset - C - 2019-08-29T20:19:04.518+02:00 - - 3.00 - - - - - 2020-04-09T13:25:32.819+02:00 - maximum_outdoor_unit_steady_temperature - C - 2019-08-29T20:19:19.739+02:00 - - 45.00 - - - - - 2020-04-09T13:25:16.208+02:00 - night_reduction_setpoint - C - 2020-04-01T01:33:40.889+02:00 - - 19.00 - - - - - 2020-04-09T13:25:08.411+02:00 - heatpump_minimum_outdoor_temperature - C - 2020-01-17T11:43:19.781+01:00 - - -2.00 - - - - - 2020-04-09T13:57:28.568+02:00 - domestic_hot_water_flow - l_min - 2020-04-09T13:27:28.022+02:00 - - 1.80 - - - - - 2020-04-09T14:10:09.380+02:00 - elga_outdoor_unit_fault_code - - 2019-08-29T20:19:27.308+02:00 - - 0 - - - - - 2020-04-09T13:51:50.028+02:00 - central_heating_state - - 2020-04-09T13:33:10.885+02:00 - - on - - - - - 2020-04-09T13:25:28.684+02:00 - external_pump_heating_lead_time - s - 2019-08-29T20:18:55.914+02:00 - - 60 - - - - - 2020-04-09T13:25:35.254+02:00 - minimum_boiler_off_time - s - 2019-08-29T20:19:16.554+02:00 - - 20 - - - - - 2020-04-01T01:29:31.827+02:00 - simultaneous_boiler_operation - - 2019-08-29T20:19:41.300+02:00 - - on - - - - - 2020-04-09T13:25:10.891+02:00 - boiler_minimum_outdoor_temperature - C - 2020-02-29T20:48:58.629+01:00 - - 14.00 - - - - - 2020-04-01T01:29:31.649+02:00 - outdoor_temperature_used - - 2019-08-29T21:06:01.315+02:00 - - on - - - - - 2020-04-09T14:10:09.625+02:00 - refrigerent_in_temperature - C - 2020-04-09T13:49:22.114+02:00 - - 29.00 - - - - - 2020-04-09T14:05:35.969+02:00 - central_heater_water_pressure - bar - 2020-04-09T13:05:35.581+02:00 - - 1.57 - - - - - 2020-04-09T13:25:28.067+02:00 - external_pump_cooling_lead_time - s - 2020-04-01T01:33:40.027+02:00 - - 120 - - - - - 2020-04-01T01:29:31.814+02:00 - heating_curve - - 2019-08-29T20:19:35.765+02:00 - - off - - - - - - burner_operation_time - s - - PT1H - - - - 2020-04-09T13:25:28.306+02:00 - internal_pump_cooling_lead_time - s - 2019-08-29T20:18:57.196+02:00 - - 120 - - - - - 2020-04-09T13:25:18.431+02:00 - indoor_temperature_transition_time - min - 2020-04-01T01:33:40.436+02:00 - - 5 - - - - - 2020-04-01T01:29:31.821+02:00 - hibernation_enabled - - 2019-08-29T20:19:38.531+02:00 - - off - - - - - 2020-04-09T13:25:18.634+02:00 - pump_lag_time - s - 2019-08-29T20:18:59.850+02:00 - - 30 - - - - - 2020-04-09T14:06:55.441+02:00 - modulation_level - - 2020-04-09T13:51:50.024+02:00 - - 0.52 - - - - - 2020-04-08T19:24:38.882+02:00 - open_therm_oem_fault_code - - 2020-04-02T08:56:10.125+02:00 - - 0 - - - - - 2020-04-09T12:00:00+02:00 - burner_efficiency - s - 2020-04-09T12:00:00+02:00 - PT1H - - 8562 - - - - - 2020-04-09T14:10:15.513+02:00 - elga_status_code - - 2020-04-09T12:44:36.599+02:00 - - 3 - - - - - 2020-04-08T19:24:39.142+02:00 - domestic_hot_water_setpoint - C - 2019-08-31T14:24:28.426+02:00 - - 60.00 - - - - - 2020-04-08T19:24:39.018+02:00 - domestic_hot_water_comfort_mode - - 2019-09-05T08:22:57.660+02:00 - - off - - - - - 2020-04-09T13:25:27.895+02:00 - maximum_cooling_supply_temperature - C - 2019-08-29T20:19:08.960+02:00 - - 21.00 - - - - - 2020-04-09T13:25:27.706+02:00 - minimum_heating_supply_temperature - C - 2019-09-06T13:34:41.651+02:00 - - 20.00 - - - - - 2020-04-08T19:24:39.011+02:00 - intended_central_heating_state - - 2020-04-03T07:54:23.120+02:00 - - off - - - - - 2020-04-09T14:10:01.382+02:00 - open_therm_slave_oem_fault_code - - 2019-08-29T20:19:29.035+02:00 - - 0 - - - - - cooling_enabled - - 2022-11-02T03:57:23.207+01:00 - 2022-11-02T03:57:23.207+01:00 - - - - off - - - - - - - 2022-11-02T03:57:23.207+01:00 - cooling_enabled - off - - - - 2020-04-09T13:25:31.144+02:00 - cooling_lower_offset - 1 - - - 2020-04-09T13:25:10.891+02:00 - boiler_minimum_outdoor_temperature - 14 - -10 - 40 - 1 - - - - - - 2020-04-09T13:25:30.119+02:00 - boiler_activation_threshold - 30 - 10 - 120 - 10 - - - 2020-04-09T13:25:27.332+02:00 - weather_dependent_maximum_supply_temperature - 60 - 30 - 90 - 10 - - - - - - 2020-04-09T13:25:18.838+02:00 - hibernation_lead_time - 10 - 1 - 24 - 1 - - - - 2020-04-09T13:25:18.431+02:00 - indoor_temperature_transition_time - 5 - 0 - 30 - 1 - - - 2020-04-09T13:25:27.895+02:00 - maximum_cooling_supply_temperature - 21 - 5 - 25 - 1 - - - - - 2020-04-09T13:25:35.107+02:00 - maximum_outdoor_unit_power_increase_temperature - 43 - 25 - 43 - 1 - - - - - - 2020-04-09T13:25:18.634+02:00 - pump_lag_time - 30 - 10 - 240 - 10 - - - 2020-04-09T13:25:08.411+02:00 - heatpump_minimum_outdoor_temperature - -2 - -16 - 4 - 1 - - - - - 2020-04-08T19:24:38.964+02:00 - maximum_boiler_temperature - 60 - 0 - 100 - 1 - - - - - 2020-04-08T19:24:38.964+02:00 - domestic_hot_water_setpoint - 53 - 35 - 60 - 0.01 - - - - - - 2020-04-09T13:25:35.254+02:00 - minimum_boiler_off_time - 20 - 0 - 60 - 5 - - - - 2020-04-09T13:25:28.067+02:00 - external_pump_cooling_lead_time - 120 - 120 - 240 - 10 - - - - 2020-04-09T13:25:28.684+02:00 - external_pump_heating_lead_time - 60 - 10 - 240 - 10 - - - - 2020-04-09T13:25:35.453+02:00 - cooling_upper_offset - 3 - - - 2020-04-09T13:25:16.208+02:00 - night_reduction_setpoint - 19 - 1 - 30 - 1 - - - - - 2020-04-09T13:25:20.096+02:00 - maximum_heating_supply_temperature - 40 - 20 - 90 - 5 - - - - - 2020-04-09T13:25:27.706+02:00 - minimum_heating_supply_temperature - 20 - 20 - 90 - 5 - - - - - 2020-04-09T13:25:30.965+02:00 - minimum_cooling_supply_temperature - 17 - 5 - 25 - 1 - - - - - - 2020-04-09T13:25:30.736+02:00 - internal_pump_heating_lead_time - 60 - 10 - 240 - 10 - - - 2020-04-09T13:25:32.819+02:00 - maximum_outdoor_unit_steady_temperature - 45 - 25 - 45 - 1 - - - - - - 2020-04-09T13:25:19.455+02:00 - minimum_boiler_run_time - 20 - 0 - 60 - 5 - - - 2020-04-09T13:25:31.429+02:00 - maximum_outdoor_unit_temperature - 47 - 25 - 47 - 1 - - - - - - 2020-04-08T19:24:39.018+02:00 - domestic_hot_water_comfort_mode - off - - - - 2020-04-09T13:25:28.306+02:00 - internal_pump_cooling_lead_time - 120 - 120 - 240 - 10 - - - - - Gateway C4930004224C - Container for variables logged about the Gateway in general. - gateway - 2019-01-31T12:00:34.582+01:00 - 2020-04-09T14:09:59.906+02:00 - - - - - 2020-04-09T14:09:59.869+02:00 - wlan_state - - 2020-04-09T08:04:19.567+02:00 - - up - - - - - 2020-04-09T14:09:59.868+02:00 - link_quality - - 2020-04-09T14:09:59.868+02:00 - - 47 - - - - - 2020-04-09T14:10:03.283+02:00 - lan_state - - 2020-03-30T21:45:12.242+02:00 - - up - - - - - 2020-04-09T14:09:59.868+02:00 - signal_strength - dBm - 2020-04-09T14:09:59.868+02:00 - - -63.00 - - - - - 2020-04-09T14:09:59.869+02:00 - wlan_ip_address - - 2020-02-26T21:11:41+01:00 - - 127.0.0.1 - - - - - 2020-04-09T14:10:03.283+02:00 - lan_ip_address - - 2020-03-21T01:21:13+01:00 - - 127.0.0.1 - - - - - - - - Anna - A thermostat - thermostat - 2019-01-31T12:00:40.511+01:00 - 2020-04-09T14:12:19.501+02:00 - - - - - - 2020-04-09T13:27:29.070+02:00 - intended_domestic_hot_water_comfort_mode - - 2020-04-01T01:33:34.802+02:00 - - off - - - - - 2020-04-09T14:12:19.497+02:00 - temperature - C - 2020-04-09T14:12:19.497+02:00 - - 19.30 - - - - - 2020-04-08T19:24:39.484+02:00 - temperature_offset - C - 2020-03-25T10:12:42.718+01:00 - - -0.50 - - - - - 2020-04-06T15:26:46.949+02:00 - button_right - - 2020-04-06T15:26:46.949+02:00 - - up - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - ThermoExtension - 6539-1301-2304 - 2018-02-08T11:15:57+01:00 - 2019-01-31T12:00:35.226+01:00 - 2019-01-31T12:03:29.884+01:00 - - - - - - - - Plugwise - Gateway - AME Smile 2.0 board - - 2019-01-31T12:00:30.328+01:00 - 2019-08-29T19:42:34.068+02:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - Techneco - - - - 2019-08-29T20:18:23.942+02:00 - 2020-04-06T10:56:42.505+02:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.0 - true - false - false - false - true - false - smart_grid_off - circulation_heat - - - - - - - - - 2019-01-31T12:00:30.650+01:00 - 2020-04-01T01:33:46.562+02:00 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/userdata/anna_heatpump_cooling/.!16852!core.domain_objects.xml b/userdata/anna_heatpump_cooling/.!16852!core.domain_objects.xml deleted file mode 100644 index e69de29bb..000000000 diff --git a/userdata/anna_heatpump_cooling/core.appliances.xml b/userdata/anna_heatpump_cooling/core.appliances.xml deleted file mode 100644 index 618f7e350..000000000 --- a/userdata/anna_heatpump_cooling/core.appliances.xml +++ /dev/null @@ -1,1278 +0,0 @@ - - - - Gateway C4930004224C - Container for variables logged about the Gateway in general. - gateway - 2019-01-31T12:00:34.582+01:00 - 2020-04-12T12:07:40.770+02:00 - - - - - 2020-04-12T12:08:41.272+02:00 - wlan_state - - 2020-04-12T12:07:40.689+02:00 - - down - - - - - 2020-04-12T11:53:07.973+02:00 - link_quality - - 2020-04-12T11:43:07.842+02:00 - - 45 - - - - - 2020-04-12T12:07:40.810+02:00 - lan_state - - 2020-03-30T21:45:12.242+02:00 - - up - - - - - 2020-04-12T11:53:07.973+02:00 - signal_strength - dBm - 2020-04-12T11:43:07.842+02:00 - - -65.00 - - - - - 2020-04-12T11:53:07.973+02:00 - wlan_ip_address - - 2020-02-26T21:11:41+01:00 - - 127.0.0.1 - - - - - 2020-04-12T12:07:40.810+02:00 - lan_ip_address - - 2020-03-21T01:21:13+01:00 - - 127.0.0.1 - - - - - - - - Central heating boiler - - heater_central - 2019-08-29T20:18:24.141+02:00 - 2020-04-16T17:29:52.193+02:00 - - - - - 2020-04-01T01:29:31.824+02:00 - night_reduction - - 2019-08-29T20:59:52.274+02:00 - - on - - - - - 2020-04-01T01:29:31.674+02:00 - first_fan_enabled - - 2019-08-29T20:19:52.760+02:00 - - off - - - - - 2020-04-16T17:11:13.115+02:00 - hibernation_lead_time - hr - 2020-04-01T01:33:42.860+02:00 - - 10 - - - - - 2020-04-01T01:29:31.818+02:00 - boiler_enabled - - 2019-08-31T09:39:37.817+02:00 - - off - - - - - 2020-04-16T17:30:16.688+02:00 - slave_boiler_state - - 2020-04-13T16:33:08.061+02:00 - - off - - - - - 2020-04-16T12:25:29.583+02:00 - domestic_hot_water_temperature - C - 2020-04-16T12:25:29.583+02:00 - - 41.50 - - - - - 2020-04-16T17:11:06.004+02:00 - maximum_outdoor_unit_power_increase_temperature - C - 2020-04-01T01:33:43.584+02:00 - - 43.00 - - - - - 2020-04-16T12:22:13.040+02:00 - return_water_temperature - C - 2020-04-16T12:22:13.040+02:00 - - 23.79 - - - - - 2020-04-01T01:29:31.810+02:00 - thermostat_supports_cooling - - 2019-09-03T13:09:35.966+02:00 - - on - - - - - 2020-04-01T01:29:31.643+02:00 - input_contacts_installed - - 2019-08-29T20:19:45.527+02:00 - - on - - - - - 2020-04-16T12:15:10.272+02:00 - boiler_temperature - C - 2020-04-16T12:15:10.272+02:00 - - 24.69 - - - - - 2020-04-01T01:29:31.830+02:00 - underfloor_heating - - 2019-08-29T20:19:42.677+02:00 - - on - - - - - 2020-04-16T17:10:50.400+02:00 - weather_dependent_maximum_supply_temperature - C - 2019-08-29T20:19:22.989+02:00 - - 60.00 - - - - - - temperature - C - - - - - 2020-04-16T17:11:13.345+02:00 - maximum_heating_supply_temperature - C - 2019-08-29T20:29:35.116+02:00 - - 40.00 - - - - - 2020-04-16T17:11:02.083+02:00 - maximum_outdoor_unit_temperature - C - 2019-08-29T20:19:21.338+02:00 - - 47.00 - - - - - 2020-04-01T01:29:31.692+02:00 - boiler_installed - - 2019-08-29T20:19:54.246+02:00 - - on - - - - - 2020-04-16T17:11:28.284+02:00 - internal_pump_heating_lead_time - s - 2019-08-29T20:18:54.646+02:00 - - 60 - - - - - 2020-04-01T01:29:31.664+02:00 - temperature_sensor_enabled - - 2019-08-29T20:19:49.846+02:00 - - off - - - - - 2020-04-01T01:29:31.652+02:00 - second_fan_enabled - - 2019-08-29T20:19:48.386+02:00 - - off - - - - - 2020-04-16T11:08:39+02:00 - burner_efficiency - s - 2020-04-16T11:08:39+02:00 - - 1309 - - - - - 2020-04-16T17:11:12.911+02:00 - minimum_boiler_run_time - s - 2020-04-01T01:33:43.099+02:00 - - 20 - - - - - 2020-04-16T16:14:50.042+02:00 - cooling_state - - 2020-04-16T16:14:50.042+02:00 - - on - - - - - 2020-04-16T17:29:52.077+02:00 - outdoor_temperature - C - 2020-04-16T17:29:52.077+02:00 - - 22.00 - - - - - 2020-04-16T17:10:48.305+02:00 - boiler_activation_threshold - Cmin - 2020-04-01T01:33:44.534+02:00 - - 30 - - - - - 2020-04-16T17:19:32.986+02:00 - flame_state - - 2020-04-16T17:19:32.986+02:00 - - off - - - - - 2020-04-01T01:29:31.806+02:00 - thermostat_enabled - - 2019-08-29T20:19:33.125+02:00 - - off - - - - - 2020-04-16T17:11:23.161+02:00 - cooling_lower_offset - C - 2019-08-29T20:19:05.905+02:00 - - 1.00 - - - - - 2020-04-01T01:29:31.670+02:00 - serial_boiler_installation - - 2019-08-29T20:19:51.287+02:00 - - off - - - - - 2020-04-16T07:59:36.755+02:00 - intended_boiler_temperature - C - 2020-04-16T07:59:36.755+02:00 - - 0.00 - - - - - 2020-04-16T17:30:22.424+02:00 - compressor_state - - 2020-04-16T17:27:14.888+02:00 - - on - - - - - 2020-04-16T17:19:32.981+02:00 - domestic_hot_water_state - - 2020-04-16T17:19:32.981+02:00 - - off - - - - - 2020-04-12T12:09:02.385+02:00 - maximum_boiler_temperature - C - 2020-04-01T01:33:34.763+02:00 - - 60.00 - - - - - 2020-04-01T01:29:31.630+02:00 - weather_dependent_regulation - - 2019-08-29T20:19:44.096+02:00 - - off - - - - - 2020-04-16T17:11:19.088+02:00 - minimum_cooling_supply_temperature - C - 2020-04-01T01:33:41.488+02:00 - - 17.00 - - - - - 2020-04-16T17:30:22.874+02:00 - refrigerent_out_temperature - C - 2020-04-08T19:24:42.196+02:00 - - 0.00 - - - - - 2020-04-16T13:18:09.829+02:00 - open_therm_application_specific_fault_code - - 2019-08-29T20:18:32.180+02:00 - - 0 - - - - - 2020-04-16T17:11:13.733+02:00 - cooling_upper_offset - C - 2019-08-29T20:19:04.518+02:00 - - 3.00 - - - - - 2020-04-16T17:11:05.150+02:00 - maximum_outdoor_unit_steady_temperature - C - 2019-08-29T20:19:19.739+02:00 - - 45.00 - - - - - 2020-04-16T17:10:45.266+02:00 - night_reduction_setpoint - C - 2020-04-01T01:33:40.889+02:00 - - 19.00 - - - - - 2020-04-16T17:10:40.984+02:00 - heatpump_minimum_outdoor_temperature - C - 2020-01-17T11:43:19.781+01:00 - - -2.00 - - - - - 2020-04-16T17:19:32.762+02:00 - domestic_hot_water_flow - l_min - 2020-04-16T16:57:08.344+02:00 - - 0.26 - - - - - 2020-04-16T17:30:21.316+02:00 - elga_outdoor_unit_fault_code - - 2019-08-29T20:19:27.308+02:00 - - 0 - - - - - 2020-04-16T17:29:40.426+02:00 - central_heating_state - - 2020-04-16T11:09:01.044+02:00 - - off - - - - - 2020-04-16T17:11:27.876+02:00 - external_pump_heating_lead_time - s - 2019-08-29T20:18:55.914+02:00 - - 60 - - - - - 2020-04-16T17:11:12.709+02:00 - minimum_boiler_off_time - s - 2019-08-29T20:19:16.554+02:00 - - 20 - - - - - 2020-04-01T01:29:31.827+02:00 - simultaneous_boiler_operation - - 2019-08-29T20:19:41.300+02:00 - - on - - - - - 2020-04-16T17:11:31.208+02:00 - boiler_minimum_outdoor_temperature - C - 2020-04-13T16:46:00.041+02:00 - - 12.00 - - - - - 2020-04-01T01:29:31.649+02:00 - outdoor_temperature_used - - 2019-08-29T21:06:01.315+02:00 - - on - - - - - 2020-04-16T17:30:23.080+02:00 - refrigerent_in_temperature - C - 2020-04-16T17:28:49.431+02:00 - - 16.00 - - - - - 2020-04-16T17:10:44.612+02:00 - central_heater_water_pressure - bar - 2020-04-16T15:10:41.505+02:00 - - 1.61 - - - - - 2020-04-16T17:11:13.524+02:00 - external_pump_cooling_lead_time - s - 2020-04-01T01:33:40.027+02:00 - - 120 - - - - - 2020-04-01T01:29:31.814+02:00 - heating_curve - - 2019-08-29T20:19:35.765+02:00 - - off - - - - - - burner_operation_time - s - - PT1H - - - - 2020-04-16T17:11:25.620+02:00 - internal_pump_cooling_lead_time - s - 2019-08-29T20:18:57.196+02:00 - - 120 - - - - - 2020-04-16T17:10:33.544+02:00 - indoor_temperature_transition_time - min - 2020-04-01T01:33:40.436+02:00 - - 5 - - - - - 2020-04-01T01:29:31.821+02:00 - hibernation_enabled - - 2019-08-29T20:19:38.531+02:00 - - off - - - - - 2020-04-16T17:10:51.587+02:00 - pump_lag_time - s - 2019-08-29T20:18:59.850+02:00 - - 30 - - - - - 2020-04-16T17:29:40.424+02:00 - modulation_level - - 2020-04-16T17:29:40.424+02:00 - - 0.40 - - - - - 2020-04-16T13:18:09.832+02:00 - open_therm_oem_fault_code - - 2020-04-16T13:18:09.832+02:00 - - 0 - - - - - 2020-04-16T10:00:00+02:00 - burner_efficiency - s - 2020-04-16T10:00:00+02:00 - PT1H - - 1096 - - - - - 2020-04-16T17:30:33.297+02:00 - elga_status_code - - 2020-04-16T16:15:13.794+02:00 - - 8 - - - - - 2020-04-12T12:09:02.538+02:00 - domestic_hot_water_setpoint - C - 2019-08-31T14:24:28.426+02:00 - - 60.00 - - - - - 2020-04-12T12:09:02.436+02:00 - domestic_hot_water_comfort_mode - - 2019-09-05T08:22:57.660+02:00 - - off - - - - - 2020-04-16T17:11:17.455+02:00 - maximum_cooling_supply_temperature - C - 2019-08-29T20:19:08.960+02:00 - - 21.00 - - - - - 2020-04-16T17:11:14.180+02:00 - minimum_heating_supply_temperature - C - 2019-09-06T13:34:41.651+02:00 - - 20.00 - - - - - 2020-04-16T07:59:48.585+02:00 - intended_central_heating_state - - 2020-04-16T07:59:48.585+02:00 - - off - - - - - 2020-04-16T17:30:18.734+02:00 - open_therm_slave_oem_fault_code - - 2019-08-29T20:19:29.035+02:00 - - 0 - - - - - cooling_enabled - - 2022-11-02T03:57:23.207+01:00 - 2022-11-02T03:57:23.207+01:00 - - - - on - - - - - - - 2020-04-16T17:11:23.161+02:00 - cooling_lower_offset - 1 - - - 2020-04-16T17:11:31.208+02:00 - boiler_minimum_outdoor_temperature - 12 - -10 - 40 - 1 - - - - - - 2020-04-16T17:10:48.305+02:00 - boiler_activation_threshold - 30 - 10 - 120 - 10 - - - 2020-04-16T17:10:50.400+02:00 - weather_dependent_maximum_supply_temperature - 60 - 30 - 90 - 10 - - - - - - 2020-04-16T17:11:13.115+02:00 - hibernation_lead_time - 10 - 1 - 24 - 1 - - - - 2020-04-16T17:10:33.544+02:00 - indoor_temperature_transition_time - 5 - 0 - 30 - 1 - - - 2020-04-16T17:11:17.455+02:00 - maximum_cooling_supply_temperature - 21 - 5 - 25 - 1 - - - - - 2020-04-16T17:11:06.004+02:00 - maximum_outdoor_unit_power_increase_temperature - 43 - 25 - 43 - 1 - - - - - - 2020-04-16T17:10:51.587+02:00 - pump_lag_time - 30 - 10 - 240 - 10 - - - 2020-04-16T17:10:40.984+02:00 - heatpump_minimum_outdoor_temperature - -2 - -16 - 4 - 1 - - - - - 2020-04-12T12:09:02.385+02:00 - maximum_boiler_temperature - 60 - 0 - 100 - 1 - - - - - - 2020-04-16T17:11:12.709+02:00 - minimum_boiler_off_time - 20 - 0 - 60 - 5 - - - - 2020-04-16T17:11:13.524+02:00 - external_pump_cooling_lead_time - 120 - 120 - 240 - 10 - - - - 2020-04-16T17:11:27.876+02:00 - external_pump_heating_lead_time - 60 - 10 - 240 - 10 - - - - 2020-04-16T17:11:13.733+02:00 - cooling_upper_offset - 3 - - - 2020-04-16T17:10:45.266+02:00 - night_reduction_setpoint - 19 - 1 - 30 - 1 - - - - - 2020-04-16T17:11:13.345+02:00 - maximum_heating_supply_temperature - 40 - 20 - 90 - 5 - - - - - 2020-04-16T17:11:14.180+02:00 - minimum_heating_supply_temperature - 20 - 20 - 90 - 5 - - - - - 2020-04-16T17:11:19.088+02:00 - minimum_cooling_supply_temperature - 17 - 5 - 25 - 1 - - - - - - 2020-04-16T17:11:28.284+02:00 - internal_pump_heating_lead_time - 60 - 10 - 240 - 10 - - - 2020-04-16T17:11:05.150+02:00 - maximum_outdoor_unit_steady_temperature - 45 - 25 - 45 - 1 - - - - - - 2020-04-16T17:11:12.911+02:00 - minimum_boiler_run_time - 20 - 0 - 60 - 5 - - - 2020-04-16T17:11:02.083+02:00 - maximum_outdoor_unit_temperature - 47 - 25 - 47 - 1 - - - - - - 2020-04-12T12:09:02.436+02:00 - domestic_hot_water_comfort_mode - off - - - - 2020-04-16T17:11:25.620+02:00 - internal_pump_cooling_lead_time - 120 - 120 - 240 - 10 - - - - - Anna - A thermostat - thermostat - 2019-01-31T12:00:40.511+01:00 - 2020-04-16T17:19:58.122+02:00 - - - - - - 2020-04-16T17:29:39.985+02:00 - intended_domestic_hot_water_comfort_mode - - 2020-04-01T01:33:34.802+02:00 - - off - - - - - 2020-04-16T17:27:49.721+02:00 - temperature - C - 2020-04-16T17:27:49.721+02:00 - - 22.29 - - - - - 2020-04-12T12:09:02.727+02:00 - temperature_offset - C - 2020-03-25T10:12:42.718+01:00 - - -0.50 - - - - - 2020-04-06T15:26:46.949+02:00 - button_right - - 2020-04-06T15:26:46.949+02:00 - - up - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - ThermoExtension - 6539-1301-2304 - 2018-02-08T11:15:57+01:00 - 2019-01-31T12:00:35.226+01:00 - 2019-01-31T12:03:29.884+01:00 - - - - - - - - - - - - 2019-01-31T12:00:30.650+01:00 - 2020-04-01T01:33:46.562+02:00 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/userdata/anna_heatpump_cooling_fake_firmware/core.appliances.xml b/userdata/anna_heatpump_cooling_fake_firmware/core.appliances.xml deleted file mode 100644 index 47d30d67a..000000000 --- a/userdata/anna_heatpump_cooling_fake_firmware/core.appliances.xml +++ /dev/null @@ -1,1267 +0,0 @@ - - - - Gateway C4930004224C - Container for variables logged about the Gateway in general. - gateway - 2019-01-31T12:00:34.582+01:00 - 2020-04-12T12:07:40.770+02:00 - - - - - 2020-04-12T12:08:41.272+02:00 - wlan_state - - 2020-04-12T12:07:40.689+02:00 - - down - - - - - 2020-04-12T11:53:07.973+02:00 - link_quality - - 2020-04-12T11:43:07.842+02:00 - - 45 - - - - - 2020-04-12T12:07:40.810+02:00 - lan_state - - 2020-03-30T21:45:12.242+02:00 - - up - - - - - 2020-04-12T11:53:07.973+02:00 - signal_strength - dBm - 2020-04-12T11:43:07.842+02:00 - - -65.00 - - - - - 2020-04-12T11:53:07.973+02:00 - wlan_ip_address - - 2020-02-26T21:11:41+01:00 - - 127.0.0.1 - - - - - 2020-04-12T12:07:40.810+02:00 - lan_ip_address - - 2020-03-21T01:21:13+01:00 - - 127.0.0.1 - - - - - - - - Central heating boiler - - heater_central - 2019-08-29T20:18:24.141+02:00 - 2020-04-16T17:29:52.193+02:00 - - - - - 2020-04-01T01:29:31.824+02:00 - night_reduction - - 2019-08-29T20:59:52.274+02:00 - - on - - - - - 2020-04-01T01:29:31.674+02:00 - first_fan_enabled - - 2019-08-29T20:19:52.760+02:00 - - off - - - - - 2020-04-16T17:11:13.115+02:00 - hibernation_lead_time - hr - 2020-04-01T01:33:42.860+02:00 - - 10 - - - - - 2020-04-01T01:29:31.818+02:00 - boiler_enabled - - 2019-08-31T09:39:37.817+02:00 - - off - - - - - 2020-04-16T17:30:16.688+02:00 - slave_boiler_state - - 2020-04-13T16:33:08.061+02:00 - - off - - - - - 2020-04-16T12:25:29.583+02:00 - domestic_hot_water_temperature - C - 2020-04-16T12:25:29.583+02:00 - - 41.50 - - - - - 2020-04-16T17:11:06.004+02:00 - maximum_outdoor_unit_power_increase_temperature - C - 2020-04-01T01:33:43.584+02:00 - - 43.00 - - - - - 2020-04-16T12:22:13.040+02:00 - return_water_temperature - C - 2020-04-16T12:22:13.040+02:00 - - 23.79 - - - - - 2020-04-01T01:29:31.810+02:00 - thermostat_supports_cooling - - 2019-09-03T13:09:35.966+02:00 - - on - - - - - 2020-04-01T01:29:31.643+02:00 - input_contacts_installed - - 2019-08-29T20:19:45.527+02:00 - - on - - - - - 2020-04-16T12:15:10.272+02:00 - boiler_temperature - C - 2020-04-16T12:15:10.272+02:00 - - 24.69 - - - - - 2020-04-01T01:29:31.830+02:00 - underfloor_heating - - 2019-08-29T20:19:42.677+02:00 - - on - - - - - 2020-04-16T17:10:50.400+02:00 - weather_dependent_maximum_supply_temperature - C - 2019-08-29T20:19:22.989+02:00 - - 60.00 - - - - - - temperature - C - - - - - 2020-04-16T17:11:13.345+02:00 - maximum_heating_supply_temperature - C - 2019-08-29T20:29:35.116+02:00 - - 40.00 - - - - - 2020-04-16T17:11:02.083+02:00 - maximum_outdoor_unit_temperature - C - 2019-08-29T20:19:21.338+02:00 - - 47.00 - - - - - 2020-04-01T01:29:31.692+02:00 - boiler_installed - - 2019-08-29T20:19:54.246+02:00 - - on - - - - - 2020-04-16T17:11:28.284+02:00 - internal_pump_heating_lead_time - s - 2019-08-29T20:18:54.646+02:00 - - 60 - - - - - 2020-04-01T01:29:31.664+02:00 - temperature_sensor_enabled - - 2019-08-29T20:19:49.846+02:00 - - off - - - - - 2020-04-01T01:29:31.652+02:00 - second_fan_enabled - - 2019-08-29T20:19:48.386+02:00 - - off - - - - - 2020-04-16T11:08:39+02:00 - burner_efficiency - s - 2020-04-16T11:08:39+02:00 - - 1309 - - - - - 2020-04-16T17:11:12.911+02:00 - minimum_boiler_run_time - s - 2020-04-01T01:33:43.099+02:00 - - 20 - - - - - 2020-04-16T16:14:50.042+02:00 - cooling_state - - 2020-04-16T16:14:50.042+02:00 - - on - - - - - - cooling_enabled - - 2022-05-19T08:54:06.913+02:00 - 2022-05-20T14:39:43.261+02:00 - - on - - - - 2020-04-16T17:29:52.077+02:00 - outdoor_temperature - C - 2020-04-16T17:29:52.077+02:00 - - 22.00 - - - - - 2020-04-16T17:10:48.305+02:00 - boiler_activation_threshold - Cmin - 2020-04-01T01:33:44.534+02:00 - - 30 - - - - - 2020-04-16T17:19:32.986+02:00 - flame_state - - 2020-04-16T17:19:32.986+02:00 - - off - - - - - 2020-04-01T01:29:31.806+02:00 - thermostat_enabled - - 2019-08-29T20:19:33.125+02:00 - - off - - - - - 2020-04-16T17:11:23.161+02:00 - cooling_lower_offset - C - 2019-08-29T20:19:05.905+02:00 - - 1.00 - - - - - 2020-04-01T01:29:31.670+02:00 - serial_boiler_installation - - 2019-08-29T20:19:51.287+02:00 - - off - - - - - 2020-04-16T07:59:36.755+02:00 - intended_boiler_temperature - C - 2020-04-16T07:59:36.755+02:00 - - 0.00 - - - - - 2020-04-16T17:30:22.424+02:00 - compressor_state - - 2020-04-16T17:27:14.888+02:00 - - on - - - - - 2020-04-16T17:19:32.981+02:00 - domestic_hot_water_state - - 2020-04-16T17:19:32.981+02:00 - - off - - - - - 2020-04-12T12:09:02.385+02:00 - maximum_boiler_temperature - C - 2020-04-01T01:33:34.763+02:00 - - 60.00 - - - - - 2020-04-01T01:29:31.630+02:00 - weather_dependent_regulation - - 2019-08-29T20:19:44.096+02:00 - - off - - - - - 2020-04-16T17:11:19.088+02:00 - minimum_cooling_supply_temperature - C - 2020-04-01T01:33:41.488+02:00 - - 17.00 - - - - - 2020-04-16T17:30:22.874+02:00 - refrigerent_out_temperature - C - 2020-04-08T19:24:42.196+02:00 - - 0.00 - - - - - 2020-04-16T13:18:09.829+02:00 - open_therm_application_specific_fault_code - - 2019-08-29T20:18:32.180+02:00 - - 0 - - - - - 2020-04-16T17:11:13.733+02:00 - cooling_upper_offset - C - 2019-08-29T20:19:04.518+02:00 - - 3.00 - - - - - 2020-04-16T17:11:05.150+02:00 - maximum_outdoor_unit_steady_temperature - C - 2019-08-29T20:19:19.739+02:00 - - 45.00 - - - - - 2020-04-16T17:10:45.266+02:00 - night_reduction_setpoint - C - 2020-04-01T01:33:40.889+02:00 - - 19.00 - - - - - 2020-04-16T17:10:40.984+02:00 - heatpump_minimum_outdoor_temperature - C - 2020-01-17T11:43:19.781+01:00 - - -2.00 - - - - - 2020-04-16T17:19:32.762+02:00 - domestic_hot_water_flow - l_min - 2020-04-16T16:57:08.344+02:00 - - 0.26 - - - - - 2020-04-16T17:30:21.316+02:00 - elga_outdoor_unit_fault_code - - 2019-08-29T20:19:27.308+02:00 - - 0 - - - - - 2020-04-16T17:29:40.426+02:00 - central_heating_state - - 2020-04-16T11:09:01.044+02:00 - - off - - - - - 2020-04-16T17:11:27.876+02:00 - external_pump_heating_lead_time - s - 2019-08-29T20:18:55.914+02:00 - - 60 - - - - - 2020-04-16T17:11:12.709+02:00 - minimum_boiler_off_time - s - 2019-08-29T20:19:16.554+02:00 - - 20 - - - - - 2020-04-01T01:29:31.827+02:00 - simultaneous_boiler_operation - - 2019-08-29T20:19:41.300+02:00 - - on - - - - - 2020-04-16T17:11:31.208+02:00 - boiler_minimum_outdoor_temperature - C - 2020-04-13T16:46:00.041+02:00 - - 12.00 - - - - - 2020-04-01T01:29:31.649+02:00 - outdoor_temperature_used - - 2019-08-29T21:06:01.315+02:00 - - on - - - - - 2020-04-16T17:30:23.080+02:00 - refrigerent_in_temperature - C - 2020-04-16T17:28:49.431+02:00 - - 16.00 - - - - - 2020-04-16T17:10:44.612+02:00 - central_heater_water_pressure - bar - 2020-04-16T15:10:41.505+02:00 - - 1.61 - - - - - 2020-04-16T17:11:13.524+02:00 - external_pump_cooling_lead_time - s - 2020-04-01T01:33:40.027+02:00 - - 120 - - - - - 2020-04-01T01:29:31.814+02:00 - heating_curve - - 2019-08-29T20:19:35.765+02:00 - - off - - - - - - burner_operation_time - s - - PT1H - - - - 2020-04-16T17:11:25.620+02:00 - internal_pump_cooling_lead_time - s - 2019-08-29T20:18:57.196+02:00 - - 120 - - - - - 2020-04-16T17:10:33.544+02:00 - indoor_temperature_transition_time - min - 2020-04-01T01:33:40.436+02:00 - - 5 - - - - - 2020-04-01T01:29:31.821+02:00 - hibernation_enabled - - 2019-08-29T20:19:38.531+02:00 - - off - - - - - 2020-04-16T17:10:51.587+02:00 - pump_lag_time - s - 2019-08-29T20:18:59.850+02:00 - - 30 - - - - - 2020-04-16T17:29:40.424+02:00 - modulation_level - - 2020-04-16T17:29:40.424+02:00 - - 1.0 - - - - - 2020-04-16T13:18:09.832+02:00 - open_therm_oem_fault_code - - 2020-04-16T13:18:09.832+02:00 - - 0 - - - - - 2020-04-16T10:00:00+02:00 - burner_efficiency - s - 2020-04-16T10:00:00+02:00 - PT1H - - 1096 - - - - - 2020-04-12T12:09:02.538+02:00 - domestic_hot_water_setpoint - C - 2019-08-31T14:24:28.426+02:00 - - 60.00 - - - - - 2020-04-12T12:09:02.436+02:00 - domestic_hot_water_comfort_mode - - 2019-09-05T08:22:57.660+02:00 - - off - - - - - 2020-04-16T17:11:17.455+02:00 - maximum_cooling_supply_temperature - C - 2019-08-29T20:19:08.960+02:00 - - 21.00 - - - - - 2020-04-16T17:11:14.180+02:00 - minimum_heating_supply_temperature - C - 2019-09-06T13:34:41.651+02:00 - - 20.00 - - - - - 2020-04-16T07:59:48.585+02:00 - intended_central_heating_state - - 2020-04-16T07:59:48.585+02:00 - - off - - - - - 2020-04-16T17:30:18.734+02:00 - open_therm_slave_oem_fault_code - - 2019-08-29T20:19:29.035+02:00 - - 0 - - - - - - - - 2020-04-16T17:11:23.161+02:00 - cooling_lower_offset - 1 - - - 2020-04-16T17:11:31.208+02:00 - boiler_minimum_outdoor_temperature - 12 - -10 - 40 - 1 - - - - - - 2020-04-16T17:10:48.305+02:00 - boiler_activation_threshold - 30 - 10 - 120 - 10 - - - 2020-04-16T17:10:50.400+02:00 - weather_dependent_maximum_supply_temperature - 60 - 30 - 90 - 10 - - - - - - 2020-04-16T17:11:13.115+02:00 - hibernation_lead_time - 10 - 1 - 24 - 1 - - - - 2020-04-16T17:10:33.544+02:00 - indoor_temperature_transition_time - 5 - 0 - 30 - 1 - - - 2020-04-16T17:11:17.455+02:00 - maximum_cooling_supply_temperature - 21 - 5 - 25 - 1 - - - - - 2020-04-16T17:11:06.004+02:00 - maximum_outdoor_unit_power_increase_temperature - 43 - 25 - 43 - 1 - - - - - - 2020-04-16T17:10:51.587+02:00 - pump_lag_time - 30 - 10 - 240 - 10 - - - 2020-04-16T17:10:40.984+02:00 - heatpump_minimum_outdoor_temperature - -2 - -16 - 4 - 1 - - - - - 2020-04-12T12:09:02.385+02:00 - maximum_boiler_temperature - 60 - 0 - 100 - 1 - - - - - - 2020-04-16T17:11:12.709+02:00 - minimum_boiler_off_time - 20 - 0 - 60 - 5 - - - - 2020-04-16T17:11:13.524+02:00 - external_pump_cooling_lead_time - 120 - 120 - 240 - 10 - - - - 2020-04-16T17:11:27.876+02:00 - external_pump_heating_lead_time - 60 - 10 - 240 - 10 - - - - 2020-04-16T17:11:13.733+02:00 - cooling_upper_offset - 3 - - - 2020-04-16T17:10:45.266+02:00 - night_reduction_setpoint - 19 - 1 - 30 - 1 - - - - - 2020-04-16T17:11:13.345+02:00 - maximum_heating_supply_temperature - 40 - 20 - 90 - 5 - - - - - 2020-04-16T17:11:14.180+02:00 - minimum_heating_supply_temperature - 20 - 20 - 90 - 5 - - - - - 2020-04-16T17:11:19.088+02:00 - minimum_cooling_supply_temperature - 17 - 5 - 25 - 1 - - - - - - 2020-04-16T17:11:28.284+02:00 - internal_pump_heating_lead_time - 60 - 10 - 240 - 10 - - - 2020-04-16T17:11:05.150+02:00 - maximum_outdoor_unit_steady_temperature - 45 - 25 - 45 - 1 - - - - - - 2020-04-16T17:11:12.911+02:00 - minimum_boiler_run_time - 20 - 0 - 60 - 5 - - - 2020-04-16T17:11:02.083+02:00 - maximum_outdoor_unit_temperature - 47 - 25 - 47 - 1 - - - - - - 2020-04-12T12:09:02.436+02:00 - domestic_hot_water_comfort_mode - off - - - - 2020-04-16T17:11:25.620+02:00 - internal_pump_cooling_lead_time - 120 - 120 - 240 - 10 - - - - - Anna - A thermostat - thermostat - 2019-01-31T12:00:40.511+01:00 - 2020-04-16T17:28:58.122+02:00 - - - - - - 2020-04-16T17:29:39.985+02:00 - intended_domestic_hot_water_comfort_mode - - 2020-04-01T01:33:34.802+02:00 - - off - - - - - 2020-04-16T17:27:49.721+02:00 - temperature - C - 2020-04-16T17:27:49.721+02:00 - - 22.29 - - - - - 2020-04-12T12:09:02.727+02:00 - temperature_offset - C - 2020-03-25T10:12:42.718+01:00 - - -0.50 - - - - - 2020-04-06T15:26:46.949+02:00 - button_right - - 2020-04-06T15:26:46.949+02:00 - - up - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - ThermoExtension - 6539-1301-2304 - 2018-02-08T11:15:57+01:00 - 2019-01-31T12:00:35.226+01:00 - 2019-01-31T12:03:29.884+01:00 - - - - - - - - - - - - 2019-01-31T12:00:30.650+01:00 - 2020-04-01T01:33:46.562+02:00 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/userdata/anna_heatpump_cooling_to_off/.!16852!core.domain_objects.xml b/userdata/anna_heatpump_cooling_to_off/.!16852!core.domain_objects.xml deleted file mode 100644 index e69de29bb..000000000 diff --git a/userdata/anna_heatpump_cooling_to_off/core.appliances.xml b/userdata/anna_heatpump_cooling_to_off/core.appliances.xml deleted file mode 100644 index e487b7195..000000000 --- a/userdata/anna_heatpump_cooling_to_off/core.appliances.xml +++ /dev/null @@ -1,1278 +0,0 @@ - - - - Gateway C4930004224C - Container for variables logged about the Gateway in general. - gateway - 2019-01-31T12:00:34.582+01:00 - 2020-04-12T12:07:40.770+02:00 - - - - - 2020-04-12T12:08:41.272+02:00 - wlan_state - - 2020-04-12T12:07:40.689+02:00 - - down - - - - - 2020-04-12T11:53:07.973+02:00 - link_quality - - 2020-04-12T11:43:07.842+02:00 - - 45 - - - - - 2020-04-12T12:07:40.810+02:00 - lan_state - - 2020-03-30T21:45:12.242+02:00 - - up - - - - - 2020-04-12T11:53:07.973+02:00 - signal_strength - dBm - 2020-04-12T11:43:07.842+02:00 - - -65.00 - - - - - 2020-04-12T11:53:07.973+02:00 - wlan_ip_address - - 2020-02-26T21:11:41+01:00 - - 127.0.0.1 - - - - - 2020-04-12T12:07:40.810+02:00 - lan_ip_address - - 2020-03-21T01:21:13+01:00 - - 127.0.0.1 - - - - - - - - Central heating boiler - - heater_central - 2019-08-29T20:18:24.141+02:00 - 2020-04-16T17:29:52.193+02:00 - - - - - 2020-04-01T01:29:31.824+02:00 - night_reduction - - 2019-08-29T20:59:52.274+02:00 - - on - - - - - 2020-04-01T01:29:31.674+02:00 - first_fan_enabled - - 2019-08-29T20:19:52.760+02:00 - - off - - - - - 2020-04-16T17:11:13.115+02:00 - hibernation_lead_time - hr - 2020-04-01T01:33:42.860+02:00 - - 10 - - - - - 2020-04-01T01:29:31.818+02:00 - boiler_enabled - - 2019-08-31T09:39:37.817+02:00 - - off - - - - - 2020-04-16T17:30:16.688+02:00 - slave_boiler_state - - 2020-04-13T16:33:08.061+02:00 - - off - - - - - 2020-04-16T12:25:29.583+02:00 - domestic_hot_water_temperature - C - 2020-04-16T12:25:29.583+02:00 - - 41.50 - - - - - 2020-04-16T17:11:06.004+02:00 - maximum_outdoor_unit_power_increase_temperature - C - 2020-04-01T01:33:43.584+02:00 - - 43.00 - - - - - 2020-04-16T12:22:13.040+02:00 - return_water_temperature - C - 2020-04-16T12:22:13.040+02:00 - - 23.79 - - - - - 2020-04-01T01:29:31.810+02:00 - thermostat_supports_cooling - - 2019-09-03T13:09:35.966+02:00 - - on - - - - - 2020-04-01T01:29:31.643+02:00 - input_contacts_installed - - 2019-08-29T20:19:45.527+02:00 - - on - - - - - 2020-04-16T12:15:10.272+02:00 - boiler_temperature - C - 2020-04-16T12:15:10.272+02:00 - - 24.69 - - - - - 2020-04-01T01:29:31.830+02:00 - underfloor_heating - - 2019-08-29T20:19:42.677+02:00 - - on - - - - - 2020-04-16T17:10:50.400+02:00 - weather_dependent_maximum_supply_temperature - C - 2019-08-29T20:19:22.989+02:00 - - 60.00 - - - - - - temperature - C - - - - - 2020-04-16T17:11:13.345+02:00 - maximum_heating_supply_temperature - C - 2019-08-29T20:29:35.116+02:00 - - 40.00 - - - - - 2020-04-16T17:11:02.083+02:00 - maximum_outdoor_unit_temperature - C - 2019-08-29T20:19:21.338+02:00 - - 47.00 - - - - - 2020-04-01T01:29:31.692+02:00 - boiler_installed - - 2019-08-29T20:19:54.246+02:00 - - on - - - - - 2020-04-16T17:11:28.284+02:00 - internal_pump_heating_lead_time - s - 2019-08-29T20:18:54.646+02:00 - - 60 - - - - - 2020-04-01T01:29:31.664+02:00 - temperature_sensor_enabled - - 2019-08-29T20:19:49.846+02:00 - - off - - - - - 2020-04-01T01:29:31.652+02:00 - second_fan_enabled - - 2019-08-29T20:19:48.386+02:00 - - off - - - - - 2020-04-16T11:08:39+02:00 - burner_efficiency - s - 2020-04-16T11:08:39+02:00 - - 1309 - - - - - 2020-04-16T17:11:12.911+02:00 - minimum_boiler_run_time - s - 2020-04-01T01:33:43.099+02:00 - - 20 - - - - - 2020-04-16T16:14:50.042+02:00 - cooling_state - - 2020-04-16T16:14:50.042+02:00 - - off - - - - - 2020-04-16T17:29:52.077+02:00 - outdoor_temperature - C - 2020-04-16T17:29:52.077+02:00 - - 3.00 - - - - - 2020-04-16T17:10:48.305+02:00 - boiler_activation_threshold - Cmin - 2020-04-01T01:33:44.534+02:00 - - 30 - - - - - 2020-04-16T17:19:32.986+02:00 - flame_state - - 2020-04-16T17:19:32.986+02:00 - - off - - - - - 2020-04-01T01:29:31.806+02:00 - thermostat_enabled - - 2019-08-29T20:19:33.125+02:00 - - off - - - - - 2020-04-16T17:11:23.161+02:00 - cooling_lower_offset - C - 2019-08-29T20:19:05.905+02:00 - - 1.00 - - - - - 2020-04-01T01:29:31.670+02:00 - serial_boiler_installation - - 2019-08-29T20:19:51.287+02:00 - - off - - - - - 2020-04-16T07:59:36.755+02:00 - intended_boiler_temperature - C - 2020-04-16T07:59:36.755+02:00 - - 0.00 - - - - - 2020-04-16T17:30:22.424+02:00 - compressor_state - - 2020-04-16T17:27:14.888+02:00 - - on - - - - - 2020-04-16T17:19:32.981+02:00 - domestic_hot_water_state - - 2020-04-16T17:19:32.981+02:00 - - off - - - - - 2020-04-12T12:09:02.385+02:00 - maximum_boiler_temperature - C - 2020-04-01T01:33:34.763+02:00 - - 60.00 - - - - - 2020-04-01T01:29:31.630+02:00 - weather_dependent_regulation - - 2019-08-29T20:19:44.096+02:00 - - off - - - - - 2020-04-16T17:11:19.088+02:00 - minimum_cooling_supply_temperature - C - 2020-04-01T01:33:41.488+02:00 - - 17.00 - - - - - 2020-04-16T17:30:22.874+02:00 - refrigerent_out_temperature - C - 2020-04-08T19:24:42.196+02:00 - - 0.00 - - - - - 2020-04-16T13:18:09.829+02:00 - open_therm_application_specific_fault_code - - 2019-08-29T20:18:32.180+02:00 - - 0 - - - - - 2020-04-16T17:11:13.733+02:00 - cooling_upper_offset - C - 2019-08-29T20:19:04.518+02:00 - - 3.00 - - - - - 2020-04-16T17:11:05.150+02:00 - maximum_outdoor_unit_steady_temperature - C - 2019-08-29T20:19:19.739+02:00 - - 45.00 - - - - - 2020-04-16T17:10:45.266+02:00 - night_reduction_setpoint - C - 2020-04-01T01:33:40.889+02:00 - - 19.00 - - - - - 2020-04-16T17:10:40.984+02:00 - heatpump_minimum_outdoor_temperature - C - 2020-01-17T11:43:19.781+01:00 - - -2.00 - - - - - 2020-04-16T17:19:32.762+02:00 - domestic_hot_water_flow - l_min - 2020-04-16T16:57:08.344+02:00 - - 0.26 - - - - - 2020-04-16T17:30:21.316+02:00 - elga_outdoor_unit_fault_code - - 2019-08-29T20:19:27.308+02:00 - - 0 - - - - - 2020-04-16T17:29:40.426+02:00 - central_heating_state - - 2020-04-16T11:09:01.044+02:00 - - off - - - - - 2020-04-16T17:11:27.876+02:00 - external_pump_heating_lead_time - s - 2019-08-29T20:18:55.914+02:00 - - 60 - - - - - 2020-04-16T17:11:12.709+02:00 - minimum_boiler_off_time - s - 2019-08-29T20:19:16.554+02:00 - - 20 - - - - - 2020-04-01T01:29:31.827+02:00 - simultaneous_boiler_operation - - 2019-08-29T20:19:41.300+02:00 - - on - - - - - 2020-04-16T17:11:31.208+02:00 - boiler_minimum_outdoor_temperature - C - 2020-04-13T16:46:00.041+02:00 - - 12.00 - - - - - 2020-04-01T01:29:31.649+02:00 - outdoor_temperature_used - - 2019-08-29T21:06:01.315+02:00 - - on - - - - - 2020-04-16T17:30:23.080+02:00 - refrigerent_in_temperature - C - 2020-04-16T17:28:49.431+02:00 - - 16.00 - - - - - 2020-04-16T17:10:44.612+02:00 - central_heater_water_pressure - bar - 2020-04-16T15:10:41.505+02:00 - - 1.61 - - - - - 2020-04-16T17:11:13.524+02:00 - external_pump_cooling_lead_time - s - 2020-04-01T01:33:40.027+02:00 - - 120 - - - - - 2020-04-01T01:29:31.814+02:00 - heating_curve - - 2019-08-29T20:19:35.765+02:00 - - off - - - - - - burner_operation_time - s - - PT1H - - - - 2020-04-16T17:11:25.620+02:00 - internal_pump_cooling_lead_time - s - 2019-08-29T20:18:57.196+02:00 - - 120 - - - - - 2020-04-16T17:10:33.544+02:00 - indoor_temperature_transition_time - min - 2020-04-01T01:33:40.436+02:00 - - 5 - - - - - 2020-04-01T01:29:31.821+02:00 - hibernation_enabled - - 2019-08-29T20:19:38.531+02:00 - - off - - - - - 2020-04-16T17:10:51.587+02:00 - pump_lag_time - s - 2019-08-29T20:18:59.850+02:00 - - 30 - - - - - 2020-04-16T17:29:40.424+02:00 - modulation_level - - 2020-04-16T17:29:40.424+02:00 - - 0.35 - - - - - 2020-04-16T13:18:09.832+02:00 - open_therm_oem_fault_code - - 2020-04-16T13:18:09.832+02:00 - - 0 - - - - - 2020-04-16T10:00:00+02:00 - burner_efficiency - s - 2020-04-16T10:00:00+02:00 - PT1H - - 1096 - - - - - 2020-04-16T17:30:33.297+02:00 - elga_status_code - - 2020-04-16T16:15:13.794+02:00 - - 8 - - - - - 2020-04-12T12:09:02.538+02:00 - domestic_hot_water_setpoint - C - 2019-08-31T14:24:28.426+02:00 - - 60.00 - - - - - 2020-04-12T12:09:02.436+02:00 - domestic_hot_water_comfort_mode - - 2019-09-05T08:22:57.660+02:00 - - off - - - - - 2020-04-16T17:11:17.455+02:00 - maximum_cooling_supply_temperature - C - 2019-08-29T20:19:08.960+02:00 - - 21.00 - - - - - 2020-04-16T17:11:14.180+02:00 - minimum_heating_supply_temperature - C - 2019-09-06T13:34:41.651+02:00 - - 20.00 - - - - - 2020-04-16T07:59:48.585+02:00 - intended_central_heating_state - - 2020-04-16T07:59:48.585+02:00 - - off - - - - - 2020-04-16T17:30:18.734+02:00 - open_therm_slave_oem_fault_code - - 2019-08-29T20:19:29.035+02:00 - - 0 - - - - - cooling_enabled - - 2022-11-02T03:57:23.207+01:00 - 2022-11-02T03:57:23.207+01:00 - - - - off - - - - - - - 2020-04-16T17:11:23.161+02:00 - cooling_lower_offset - 1 - - - 2020-04-16T17:11:31.208+02:00 - boiler_minimum_outdoor_temperature - 12 - -10 - 40 - 1 - - - - - - 2020-04-16T17:10:48.305+02:00 - boiler_activation_threshold - 30 - 10 - 120 - 10 - - - 2020-04-16T17:10:50.400+02:00 - weather_dependent_maximum_supply_temperature - 60 - 30 - 90 - 10 - - - - - - 2020-04-16T17:11:13.115+02:00 - hibernation_lead_time - 10 - 1 - 24 - 1 - - - - 2020-04-16T17:10:33.544+02:00 - indoor_temperature_transition_time - 5 - 0 - 30 - 1 - - - 2020-04-16T17:11:17.455+02:00 - maximum_cooling_supply_temperature - 21 - 5 - 25 - 1 - - - - - 2020-04-16T17:11:06.004+02:00 - maximum_outdoor_unit_power_increase_temperature - 43 - 25 - 43 - 1 - - - - - - 2020-04-16T17:10:51.587+02:00 - pump_lag_time - 30 - 10 - 240 - 10 - - - 2020-04-16T17:10:40.984+02:00 - heatpump_minimum_outdoor_temperature - -2 - -16 - 4 - 1 - - - - - 2020-04-12T12:09:02.385+02:00 - maximum_boiler_temperature - 60 - 0 - 100 - 1 - - - - - - 2020-04-16T17:11:12.709+02:00 - minimum_boiler_off_time - 20 - 0 - 60 - 5 - - - - 2020-04-16T17:11:13.524+02:00 - external_pump_cooling_lead_time - 120 - 120 - 240 - 10 - - - - 2020-04-16T17:11:27.876+02:00 - external_pump_heating_lead_time - 60 - 10 - 240 - 10 - - - - 2020-04-16T17:11:13.733+02:00 - cooling_upper_offset - 3 - - - 2020-04-16T17:10:45.266+02:00 - night_reduction_setpoint - 19 - 1 - 30 - 1 - - - - - 2020-04-16T17:11:13.345+02:00 - maximum_heating_supply_temperature - 40 - 20 - 90 - 5 - - - - - 2020-04-16T17:11:14.180+02:00 - minimum_heating_supply_temperature - 20 - 20 - 90 - 5 - - - - - 2020-04-16T17:11:19.088+02:00 - minimum_cooling_supply_temperature - 17 - 5 - 25 - 1 - - - - - - 2020-04-16T17:11:28.284+02:00 - internal_pump_heating_lead_time - 60 - 10 - 240 - 10 - - - 2020-04-16T17:11:05.150+02:00 - maximum_outdoor_unit_steady_temperature - 45 - 25 - 45 - 1 - - - - - - 2020-04-16T17:11:12.911+02:00 - minimum_boiler_run_time - 20 - 0 - 60 - 5 - - - 2020-04-16T17:11:02.083+02:00 - maximum_outdoor_unit_temperature - 47 - 25 - 47 - 1 - - - - - - 2020-04-12T12:09:02.436+02:00 - domestic_hot_water_comfort_mode - off - - - - 2020-04-16T17:11:25.620+02:00 - internal_pump_cooling_lead_time - 120 - 120 - 240 - 10 - - - - - Anna - A thermostat - thermostat - 2019-01-31T12:00:40.511+01:00 - 2020-04-16T17:28:58.122+02:00 - - - - - - 2020-04-16T17:29:39.985+02:00 - intended_domestic_hot_water_comfort_mode - - 2020-04-01T01:33:34.802+02:00 - - off - - - - - 2020-04-16T17:27:49.721+02:00 - temperature - C - 2020-04-16T17:27:49.721+02:00 - - 22.29 - - - - - 2020-04-12T12:09:02.727+02:00 - temperature_offset - C - 2020-03-25T10:12:42.718+01:00 - - -0.50 - - - - - 2020-04-06T15:26:46.949+02:00 - button_right - - 2020-04-06T15:26:46.949+02:00 - - up - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - ThermoExtension - 6539-1301-2304 - 2018-02-08T11:15:57+01:00 - 2019-01-31T12:00:35.226+01:00 - 2019-01-31T12:03:29.884+01:00 - - - - - - - - - - - - 2019-01-31T12:00:30.650+01:00 - 2020-04-01T01:33:46.562+02:00 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/userdata/anna_heatpump_heating/core.appliances.xml b/userdata/anna_heatpump_heating/core.appliances.xml deleted file mode 100644 index fee2e658c..000000000 --- a/userdata/anna_heatpump_heating/core.appliances.xml +++ /dev/null @@ -1,1294 +0,0 @@ - - - - Central heating boiler - - heater_central - 2019-08-29T20:18:24.141+02:00 - 2020-04-09T14:10:05.574+02:00 - - - - - 2020-04-01T01:29:31.824+02:00 - night_reduction - - 2019-08-29T20:59:52.274+02:00 - - on - - - - - 2020-04-01T01:29:31.674+02:00 - first_fan_enabled - - 2019-08-29T20:19:52.760+02:00 - - off - - - - - 2020-04-09T13:25:18.838+02:00 - hibernation_lead_time - hr - 2020-04-01T01:33:42.860+02:00 - - 10 - - - - - 2020-04-01T01:29:31.818+02:00 - boiler_enabled - - 2019-08-31T09:39:37.817+02:00 - - off - - - - - 2020-04-09T14:09:54.218+02:00 - slave_boiler_state - - 2020-04-01T09:24:19.878+02:00 - - off - - - - - 2020-04-09T14:10:05.571+02:00 - domestic_hot_water_temperature - C - 2020-04-09T14:10:05.571+02:00 - - 46.34 - - - - - 2020-04-09T13:25:35.107+02:00 - maximum_outdoor_unit_power_increase_temperature - C - 2020-04-01T01:33:43.584+02:00 - - 43.00 - - - - - 2020-04-09T14:08:11.233+02:00 - return_water_temperature - C - 2020-04-09T14:08:11.233+02:00 - - 25.09 - - - - - 2020-04-01T01:29:31.810+02:00 - thermostat_supports_cooling - - 2019-09-03T13:09:35.966+02:00 - - on - - - - - 2020-04-01T01:29:31.643+02:00 - input_contacts_installed - - 2019-08-29T20:19:45.527+02:00 - - on - - - - - 2020-04-09T14:09:02.597+02:00 - boiler_temperature - C - 2020-04-09T14:09:02.597+02:00 - - 29.09 - - - - - 2020-04-01T01:29:31.830+02:00 - underfloor_heating - - 2019-08-29T20:19:42.677+02:00 - - on - - - - - 2020-04-09T13:25:27.332+02:00 - weather_dependent_maximum_supply_temperature - C - 2019-08-29T20:19:22.989+02:00 - - 60.00 - - - - - - temperature - C - - - - - 2020-04-09T13:25:20.096+02:00 - maximum_heating_supply_temperature - C - 2019-08-29T20:29:35.116+02:00 - - 40.00 - - - - - 2020-04-09T13:25:31.429+02:00 - maximum_outdoor_unit_temperature - C - 2019-08-29T20:19:21.338+02:00 - - 47.00 - - - - - 2020-04-01T01:29:31.692+02:00 - boiler_installed - - 2019-08-29T20:19:54.246+02:00 - - on - - - - - 2020-04-09T13:25:30.736+02:00 - internal_pump_heating_lead_time - s - 2019-08-29T20:18:54.646+02:00 - - 60 - - - - - 2020-04-01T01:29:31.664+02:00 - temperature_sensor_enabled - - 2019-08-29T20:19:49.846+02:00 - - off - - - - - 2020-04-01T01:29:31.652+02:00 - second_fan_enabled - - 2019-08-29T20:19:48.386+02:00 - - off - - - - - 2020-04-09T13:33:10+02:00 - burner_efficiency - s - 2020-04-09T13:33:10+02:00 - - 7372 - - - - - 2020-04-09T13:25:19.455+02:00 - minimum_boiler_run_time - s - 2020-04-01T01:33:43.099+02:00 - - 20 - - - - - 2020-04-08T22:30:51.045+02:00 - cooling_state - - 2020-04-08T22:30:51.045+02:00 - - off - - - - - 2020-04-09T14:06:36.049+02:00 - outdoor_temperature - C - 2020-04-09T13:51:55.147+02:00 - - 3.00 - - - - - 2020-04-09T13:25:30.119+02:00 - boiler_activation_threshold - Cmin - 2020-04-01T01:33:44.534+02:00 - - 30 - - - - - 2020-04-09T13:27:29.096+02:00 - flame_state - - 2020-04-09T13:27:29.096+02:00 - - off - - - - - 2020-04-01T01:29:31.806+02:00 - thermostat_enabled - - 2019-08-29T20:19:33.125+02:00 - - off - - - - - 2020-04-09T13:25:31.144+02:00 - cooling_lower_offset - C - 2019-08-29T20:19:05.905+02:00 - - 1.00 - - - - - 2020-04-01T01:29:31.670+02:00 - serial_boiler_installation - - 2019-08-29T20:19:51.287+02:00 - - off - - - - - 2020-04-08T19:24:39.363+02:00 - intended_boiler_temperature - C - 2020-04-03T07:54:47.729+02:00 - - 35.00 - - - - - 2020-04-09T14:09:54.416+02:00 - compressor_state - - 2020-04-09T12:47:28.377+02:00 - - on - - - - - 2020-04-09T13:27:29.089+02:00 - domestic_hot_water_state - - 2020-04-09T13:27:29.089+02:00 - - off - - - - - 2020-04-08T19:24:38.964+02:00 - maximum_boiler_temperature - C - 2020-04-01T01:33:34.763+02:00 - - 60.00 - - - - - 2020-04-01T01:29:31.630+02:00 - weather_dependent_regulation - - 2019-08-29T20:19:44.096+02:00 - - off - - - - - 2020-04-09T13:25:30.965+02:00 - minimum_cooling_supply_temperature - C - 2020-04-01T01:33:41.488+02:00 - - 17.00 - - - - - 2020-04-09T14:10:17.399+02:00 - refrigerent_out_temperature - C - 2020-04-08T19:24:42.196+02:00 - - 0.00 - - - - - 2020-04-08T19:24:38.879+02:00 - open_therm_application_specific_fault_code - - 2019-08-29T20:18:32.180+02:00 - - 0 - - - - - 2020-04-09T13:25:35.453+02:00 - cooling_upper_offset - C - 2019-08-29T20:19:04.518+02:00 - - 3.00 - - - - - 2020-04-09T13:25:32.819+02:00 - maximum_outdoor_unit_steady_temperature - C - 2019-08-29T20:19:19.739+02:00 - - 45.00 - - - - - 2020-04-09T13:25:16.208+02:00 - night_reduction_setpoint - C - 2020-04-01T01:33:40.889+02:00 - - 19.00 - - - - - 2020-04-09T13:25:08.411+02:00 - heatpump_minimum_outdoor_temperature - C - 2020-01-17T11:43:19.781+01:00 - - -2.00 - - - - - 2020-04-09T13:57:28.568+02:00 - domestic_hot_water_flow - l_min - 2020-04-09T13:27:28.022+02:00 - - 1.80 - - - - - 2020-04-09T14:10:09.380+02:00 - elga_outdoor_unit_fault_code - - 2019-08-29T20:19:27.308+02:00 - - 0 - - - - - 2020-04-09T13:51:50.028+02:00 - central_heating_state - - 2020-04-09T13:33:10.885+02:00 - - on - - - - - 2020-04-09T13:25:28.684+02:00 - external_pump_heating_lead_time - s - 2019-08-29T20:18:55.914+02:00 - - 60 - - - - - 2020-04-09T13:25:35.254+02:00 - minimum_boiler_off_time - s - 2019-08-29T20:19:16.554+02:00 - - 20 - - - - - 2020-04-01T01:29:31.827+02:00 - simultaneous_boiler_operation - - 2019-08-29T20:19:41.300+02:00 - - on - - - - - 2020-04-09T13:25:10.891+02:00 - boiler_minimum_outdoor_temperature - C - 2020-02-29T20:48:58.629+01:00 - - 14.00 - - - - - 2020-04-01T01:29:31.649+02:00 - outdoor_temperature_used - - 2019-08-29T21:06:01.315+02:00 - - on - - - - - 2020-04-09T14:10:09.625+02:00 - refrigerent_in_temperature - C - 2020-04-09T13:49:22.114+02:00 - - 29.00 - - - - - 2020-04-09T14:05:35.969+02:00 - central_heater_water_pressure - bar - 2020-04-09T13:05:35.581+02:00 - - 1.57 - - - - - 2020-04-09T13:25:28.067+02:00 - external_pump_cooling_lead_time - s - 2020-04-01T01:33:40.027+02:00 - - 120 - - - - - 2020-04-01T01:29:31.814+02:00 - heating_curve - - 2019-08-29T20:19:35.765+02:00 - - off - - - - - - burner_operation_time - s - - PT1H - - - - 2020-04-09T13:25:28.306+02:00 - internal_pump_cooling_lead_time - s - 2019-08-29T20:18:57.196+02:00 - - 120 - - - - - 2020-04-09T13:25:18.431+02:00 - indoor_temperature_transition_time - min - 2020-04-01T01:33:40.436+02:00 - - 5 - - - - - 2020-04-01T01:29:31.821+02:00 - hibernation_enabled - - 2019-08-29T20:19:38.531+02:00 - - off - - - - - 2020-04-09T13:25:18.634+02:00 - pump_lag_time - s - 2019-08-29T20:18:59.850+02:00 - - 30 - - - - - 2020-04-09T14:06:55.441+02:00 - modulation_level - - 2020-04-09T13:51:50.024+02:00 - - 0.52 - - - - - 2020-04-08T19:24:38.882+02:00 - open_therm_oem_fault_code - - 2020-04-02T08:56:10.125+02:00 - - 0 - - - - - 2020-04-09T12:00:00+02:00 - burner_efficiency - s - 2020-04-09T12:00:00+02:00 - PT1H - - 8562 - - - - - 2020-04-09T14:10:15.513+02:00 - elga_status_code - - 2020-04-09T12:44:36.599+02:00 - - 3 - - - - - 2020-04-08T19:24:39.142+02:00 - domestic_hot_water_setpoint - C - 2019-08-31T14:24:28.426+02:00 - - 60.00 - - - - - 2020-04-08T19:24:39.018+02:00 - domestic_hot_water_comfort_mode - - 2019-09-05T08:22:57.660+02:00 - - off - - - - - 2020-04-09T13:25:27.895+02:00 - maximum_cooling_supply_temperature - C - 2019-08-29T20:19:08.960+02:00 - - 21.00 - - - - - 2020-04-09T13:25:27.706+02:00 - minimum_heating_supply_temperature - C - 2019-09-06T13:34:41.651+02:00 - - 20.00 - - - - - 2020-04-08T19:24:39.011+02:00 - intended_central_heating_state - - 2020-04-03T07:54:23.120+02:00 - - off - - - - - 2020-04-09T14:10:01.382+02:00 - open_therm_slave_oem_fault_code - - 2019-08-29T20:19:29.035+02:00 - - 0 - - - - - cooling_enabled - - 2022-11-02T03:57:23.207+01:00 - 2022-11-02T03:57:23.207+01:00 - - - - off - - - - - - - 2022-11-02T03:57:23.207+01:00 - cooling_enabled - off - - - - 2020-04-09T13:25:31.144+02:00 - cooling_lower_offset - 1 - - - 2020-04-09T13:25:10.891+02:00 - boiler_minimum_outdoor_temperature - 14 - -10 - 40 - 1 - - - - - - 2020-04-09T13:25:30.119+02:00 - boiler_activation_threshold - 30 - 10 - 120 - 10 - - - 2020-04-09T13:25:27.332+02:00 - weather_dependent_maximum_supply_temperature - 60 - 30 - 90 - 10 - - - - - - 2020-04-09T13:25:18.838+02:00 - hibernation_lead_time - 10 - 1 - 24 - 1 - - - - 2020-04-09T13:25:18.431+02:00 - indoor_temperature_transition_time - 5 - 0 - 30 - 1 - - - 2020-04-09T13:25:27.895+02:00 - maximum_cooling_supply_temperature - 21 - 5 - 25 - 1 - - - - - 2020-04-09T13:25:35.107+02:00 - maximum_outdoor_unit_power_increase_temperature - 43 - 25 - 43 - 1 - - - - - - 2020-04-09T13:25:18.634+02:00 - pump_lag_time - 30 - 10 - 240 - 10 - - - 2020-04-09T13:25:08.411+02:00 - heatpump_minimum_outdoor_temperature - -2 - -16 - 4 - 1 - - - - - 2020-04-08T19:24:38.964+02:00 - maximum_boiler_temperature - 60 - 0 - 100 - 1 - - - - - 2020-04-08T19:24:38.964+02:00 - domestic_hot_water_setpoint - 53 - 35 - 60 - 0.01 - - - - - - 2020-04-09T13:25:35.254+02:00 - minimum_boiler_off_time - 20 - 0 - 60 - 5 - - - - 2020-04-09T13:25:28.067+02:00 - external_pump_cooling_lead_time - 120 - 120 - 240 - 10 - - - - 2020-04-09T13:25:28.684+02:00 - external_pump_heating_lead_time - 60 - 10 - 240 - 10 - - - - 2020-04-09T13:25:35.453+02:00 - cooling_upper_offset - 3 - - - 2020-04-09T13:25:16.208+02:00 - night_reduction_setpoint - 19 - 1 - 30 - 1 - - - - - 2020-04-09T13:25:20.096+02:00 - maximum_heating_supply_temperature - 40 - 20 - 90 - 5 - - - - - 2020-04-09T13:25:27.706+02:00 - minimum_heating_supply_temperature - 20 - 20 - 90 - 5 - - - - - 2020-04-09T13:25:30.965+02:00 - minimum_cooling_supply_temperature - 17 - 5 - 25 - 1 - - - - - - 2020-04-09T13:25:30.736+02:00 - internal_pump_heating_lead_time - 60 - 10 - 240 - 10 - - - 2020-04-09T13:25:32.819+02:00 - maximum_outdoor_unit_steady_temperature - 45 - 25 - 45 - 1 - - - - - - 2020-04-09T13:25:19.455+02:00 - minimum_boiler_run_time - 20 - 0 - 60 - 5 - - - 2020-04-09T13:25:31.429+02:00 - maximum_outdoor_unit_temperature - 47 - 25 - 47 - 1 - - - - - - 2020-04-08T19:24:39.018+02:00 - domestic_hot_water_comfort_mode - off - - - - 2020-04-09T13:25:28.306+02:00 - internal_pump_cooling_lead_time - 120 - 120 - 240 - 10 - - - - - Gateway C4930004224C - Container for variables logged about the Gateway in general. - gateway - 2019-01-31T12:00:34.582+01:00 - 2020-04-09T14:09:59.906+02:00 - - - - - 2020-04-09T14:09:59.869+02:00 - wlan_state - - 2020-04-09T08:04:19.567+02:00 - - up - - - - - 2020-04-09T14:09:59.868+02:00 - link_quality - - 2020-04-09T14:09:59.868+02:00 - - 47 - - - - - 2020-04-09T14:10:03.283+02:00 - lan_state - - 2020-03-30T21:45:12.242+02:00 - - up - - - - - 2020-04-09T14:09:59.868+02:00 - signal_strength - dBm - 2020-04-09T14:09:59.868+02:00 - - -63.00 - - - - - 2020-04-09T14:09:59.869+02:00 - wlan_ip_address - - 2020-02-26T21:11:41+01:00 - - 127.0.0.1 - - - - - 2020-04-09T14:10:03.283+02:00 - lan_ip_address - - 2020-03-21T01:21:13+01:00 - - 127.0.0.1 - - - - - - - - Anna - A thermostat - thermostat - 2019-01-31T12:00:40.511+01:00 - 2020-04-09T14:12:19.501+02:00 - - - - - - 2020-04-09T13:27:29.070+02:00 - intended_domestic_hot_water_comfort_mode - - 2020-04-01T01:33:34.802+02:00 - - off - - - - - 2020-04-09T14:12:19.497+02:00 - temperature - C - 2020-04-09T14:12:19.497+02:00 - - 19.30 - - - - - 2020-04-08T19:24:39.484+02:00 - temperature_offset - C - 2020-03-25T10:12:42.718+01:00 - - -0.50 - - - - - 2020-04-06T15:26:46.949+02:00 - button_right - - 2020-04-06T15:26:46.949+02:00 - - up - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - ThermoExtension - 6539-1301-2304 - 2018-02-08T11:15:57+01:00 - 2019-01-31T12:00:35.226+01:00 - 2019-01-31T12:03:29.884+01:00 - - - - - - - - Plugwise - Gateway - AME Smile 2.0 board - - 2019-01-31T12:00:30.328+01:00 - 2019-08-29T19:42:34.068+02:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - Techneco - - - - 2019-08-29T20:18:23.942+02:00 - 2020-04-06T10:56:42.505+02:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.0 - true - false - false - false - true - false - smart_grid_off - circulation_heat - - - - - - - - - 2019-01-31T12:00:30.650+01:00 - 2020-04-01T01:33:46.562+02:00 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/userdata/anna_loria_cooling_active/core.appliances.xml b/userdata/anna_loria_cooling_active/core.appliances.xml deleted file mode 100644 index 4aaecaf9e..000000000 --- a/userdata/anna_loria_cooling_active/core.appliances.xml +++ /dev/null @@ -1,732 +0,0 @@ - - - - Anna - A thermostat - thermostat - 2022-05-13T22:01:39.377+02:00 - 2022-09-29T16:33:16.239+02:00 - - - - - - button_top - - 2022-09-22T07:57:35.466+02:00 - 2022-09-22T07:57:35.466+02:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2022-01-10T12:48:48.266+01:00 - 2022-01-10T12:48:48.545+01:00 - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - Gateway - AME Smile 2.0 board - - 2022-01-10T12:48:47.992+01:00 - 2022-05-19T16:31:45.752+02:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - ThermoExtension - 6539-1301-2304 - 2018-02-08T11:15:57+01:00 - 2022-01-10T12:49:23.072+01:00 - 2022-05-13T22:15:35.630+02:00 - - - - - - - - Atlantic - 173 - - - 2022-05-13T22:15:35.632+02:00 - 2022-09-28T22:51:25.720+02:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 4.0 - true - false - false - false - true - false - true - true - smart_grid_off - off - - - - diff --git a/userdata/anna_loria_driessens/core.appliances.xml b/userdata/anna_loria_driessens/core.appliances.xml deleted file mode 100644 index 44b219d56..000000000 --- a/userdata/anna_loria_driessens/core.appliances.xml +++ /dev/null @@ -1,712 +0,0 @@ - - - - Anna - A thermostat - thermostat - 2020-10-14T11:53:44.958+02:00 - 2023-11-26T15:41:32.059+01:00 - - - - - - preheating_target_temperature_rate - C_hr - 2023-11-22T10:16:52.362+01:00 - 2023-11-22T10:16:52.362+01:00 - - - - 1.58 - - - - cpu_frequency - Hz - 2023-11-26T11:55:10+01:00 - 2023-11-26T11:55:10+01:00 - - - - 8000000 - - - - derivative_coefficient - s - 2023-11-15T10:17:33.785+01:00 - 2023-11-15T10:17:33.785+01:00 - - - - 0 - - - - decentral_heat_demand_offset - C - 2023-11-26T15:41:32.056+01:00 - 2023-11-26T15:41:32.056+01:00 - - - - 0.00 - - - - button_left - - 2023-11-03T16:00:55.343+01:00 - 2023-11-03T16:00:55.343+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2020-09-04T16:00:23.469+02:00 - 2020-09-04T16:00:23.770+02:00 - - - - - - - - - - - - - - - - - - - - - - - - Atlantic - 173 - - - 2020-10-14T12:08:54.991+02:00 - 2023-11-25T23:06:23.547+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 4.0 - true - false - false - false - true - false - true - true - smart_grid_off - off - - - - diff --git a/userdata/anna_loria_heating_idle/core.appliances.xml b/userdata/anna_loria_heating_idle/core.appliances.xml deleted file mode 100644 index 6ca648fcd..000000000 --- a/userdata/anna_loria_heating_idle/core.appliances.xml +++ /dev/null @@ -1,667 +0,0 @@ - - - - Anna - A thermostat - thermostat - 2022-05-13T22:01:39.377+02:00 - 2022-09-29T16:33:16.239+02:00 - - - - - - button_top - - 2022-09-22T07:57:35.466+02:00 - 2022-09-22T07:57:35.466+02:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2022-01-10T12:48:48.266+01:00 - 2022-01-10T12:48:48.545+01:00 - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - Gateway - AME Smile 2.0 board - - 2022-01-10T12:48:47.992+01:00 - 2022-05-19T16:31:45.752+02:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - ThermoExtension - 6539-1301-2304 - 2018-02-08T11:15:57+01:00 - 2022-01-10T12:49:23.072+01:00 - 2022-05-13T22:15:35.630+02:00 - - - - - - - - Atlantic - 173 - - - 2022-05-13T22:15:35.632+02:00 - 2022-09-28T22:51:25.720+02:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 4.0 - true - false - false - false - true - false - true - true - smart_grid_off - off - - - - diff --git a/userdata/anna_v4/.!16969!core.domain_objects.xml b/userdata/anna_v4/.!16969!core.domain_objects.xml deleted file mode 100644 index e69de29bb..000000000 diff --git a/userdata/anna_v4/core.appliances.xml b/userdata/anna_v4/core.appliances.xml deleted file mode 100644 index a10c2a676..000000000 --- a/userdata/anna_v4/core.appliances.xml +++ /dev/null @@ -1,569 +0,0 @@ - - - - Central heating boiler - - heater_central - 2019-05-14T20:03:36.683+02:00 - 2020-04-02T09:49:39.969+02:00 - - - - - 2020-04-02T09:40:45.299+02:00 - domestic_hot_water_flow - l_min - 2020-04-02T08:55:43.781+02:00 - - 0.00 - - - - - 2020-04-02T09:49:39.966+02:00 - flame_state - - 2020-04-02T09:49:39.966+02:00 - - on - - - - - 2020-04-02T08:58:29+02:00 - domestic_hot_water_burner_operation_time - hr - 2020-04-02T08:58:29+02:00 - - 105 - - - - - 2020-04-02T09:49:04.111+02:00 - boiler_temperature - C - 2020-04-02T09:49:04.111+02:00 - - 52.00 - - - - - 2020-04-02T09:49:04.772+02:00 - intended_boiler_temperature - C - 2020-04-02T09:49:04.772+02:00 - - 48.56 - - - - - 2020-04-01T09:58:10.130+02:00 - domestic_hot_water_comfort_mode - - 2019-05-17T09:11:06.126+02:00 - - off - - - - - - burner_operation_time - s - - PT1H - - - - 2020-04-02T08:58:29+02:00 - domestic_hot_water_burner_starts - - 2020-04-02T08:58:29+02:00 - - 4348 - - - - - 2020-04-01T09:58:10.148+02:00 - domestic_hot_water_setpoint - C - 2019-05-14T20:03:51.811+02:00 - - 60.00 - - - - - 2020-04-01T09:58:09.946+02:00 - open_therm_application_specific_fault_code - - 2020-04-01T05:20:02.497+02:00 - - 0 - - - - - 2020-04-02T09:49:04.751+02:00 - return_water_temperature - C - 2020-04-02T09:49:04.751+02:00 - - 42.00 - - - - - 2020-04-02T08:55:49.305+02:00 - domestic_hot_water_state - - 2020-04-02T08:55:49.305+02:00 - - off - - - - - 2020-04-01T09:58:09.977+02:00 - maximum_boiler_temperature - C - 2020-04-01T05:20:03.542+02:00 - - 70.00 - - - - - 2020-04-02T09:47:04.657+02:00 - central_heating_state - - 2020-04-02T09:47:04.657+02:00 - - on - - - - - 2020-04-02T08:00:00+02:00 - burner_efficiency - s - 2020-04-02T08:00:00+02:00 - PT1H - - 2682 - - - - - 2020-04-02T08:33:57.435+02:00 - intended_central_heating_state - - 2020-04-02T08:33:57.435+02:00 - - on - - - - - 2020-04-01T09:58:09.949+02:00 - open_therm_oem_fault_code - - 2019-05-14T20:03:45.705+02:00 - - 0 - - - - - 2020-04-02T09:45:26.337+02:00 - modulation_level - - 2020-04-01T23:19:16.599+02:00 - - 0.00 - - - - - 2020-04-02T08:58:28+02:00 - burner_starts - - 2020-04-02T08:58:28+02:00 - - 11456 - - - - - 2020-04-02T08:58:35+02:00 - burner_operation_time - hr - 2020-04-02T08:58:35+02:00 - - 926 - - - - - 2020-04-02T09:47:04+02:00 - burner_efficiency - s - 2020-04-02T09:47:04+02:00 - - 2898 - - - - - 2020-04-02T09:44:17.359+02:00 - open_therm_oem_diagnostic_code - - 2020-04-02T09:44:17.358+02:00 - - 204 - - - - - 2020-04-02T08:58:49.500+02:00 - central_heater_water_pressure - bar - 2020-04-02T08:58:49.500+02:00 - - 2.10 - - - - - - - 2020-04-01T09:58:10.148+02:00 - domestic_hot_water_setpoint - 60 - 30 - 60 - 0.01 - - - - - - 2020-04-01T09:58:10.130+02:00 - domestic_hot_water_comfort_mode - off - - - 2020-04-01T09:58:09.977+02:00 - maximum_boiler_temperature - 70 - 0 - 100 - 1 - - - - - - - Anna - A thermostat - thermostat - 2019-01-31T10:06:52.274+01:00 - 2020-04-02T09:49:23.085+02:00 - - - - - - 2019-05-14T20:14:15.490+02:00 - proximity_detection - - 2019-05-14T20:14:15.490+02:00 - - no_proximity_detected - - - - - 2020-04-02T09:49:29.749+02:00 - decentral_heat_demand_offset - C - 2020-04-01T05:20:03.697+02:00 - - 0.00 - - - - - 2020-04-01T09:58:10.276+02:00 - open_therm_boiler_activation_threshold - C - 2019-05-14T20:04:03.321+02:00 - - 10.00 - - - - - 2020-04-02T09:49:29.723+02:00 - temperature - C - 2020-04-02T09:45:34.137+02:00 - - 20.48 - - - - - 2020-04-01T09:58:10.284+02:00 - derivative_coefficient - s - 2020-04-01T05:20:03.770+02:00 - - 0 - - - - - 2020-04-01T09:58:10.278+02:00 - onoff_boiler_temperature_deadband - C - 2019-05-14T21:30:11.826+02:00 - - 0.70 - - - - - 2020-04-02T08:33:04.730+02:00 - preset_state - - 2020-04-02T08:33:04.730+02:00 - - home - - - - - 2020-04-02T08:33:20+02:00 - cpu_frequency - Hz - 2020-04-02T08:33:20+02:00 - - 8000000 - - - - - 2020-03-22T20:55:51.287+01:00 - button_right - - 2020-03-22T20:55:51.287+01:00 - - up - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Bosch Thermotechniek B.V. - 2.32 - - - 2019-05-14T20:03:36.453+02:00 - 2020-04-01T05:20:02.787+02:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.0 - true - false - false - false - true - false - smart_grid_off - off - - - - diff --git a/userdata/anna_v4_dhw/core.appliances.xml b/userdata/anna_v4_dhw/core.appliances.xml deleted file mode 100644 index bb98b538d..000000000 --- a/userdata/anna_v4_dhw/core.appliances.xml +++ /dev/null @@ -1,569 +0,0 @@ - - - - Central heating boiler - - heater_central - 2019-05-14T20:03:36.683+02:00 - 2020-04-02T09:49:39.969+02:00 - - - - - 2020-04-02T09:40:45.299+02:00 - domestic_hot_water_flow - l_min - 2020-04-02T08:55:43.781+02:00 - - 0.00 - - - - - 2020-04-02T09:49:39.966+02:00 - flame_state - - 2020-04-02T09:49:39.966+02:00 - - on - - - - - 2020-04-02T08:58:29+02:00 - domestic_hot_water_burner_operation_time - hr - 2020-04-02T08:58:29+02:00 - - 105 - - - - - 2020-04-02T09:49:04.111+02:00 - boiler_temperature - C - 2020-04-02T09:49:04.111+02:00 - - 52.00 - - - - - 2020-04-02T09:49:04.772+02:00 - intended_boiler_temperature - C - 2020-04-02T09:49:04.772+02:00 - - 48.56 - - - - - 2020-04-01T09:58:10.130+02:00 - domestic_hot_water_comfort_mode - - 2019-05-17T09:11:06.126+02:00 - - off - - - - - - burner_operation_time - s - - PT1H - - - - 2020-04-02T08:58:29+02:00 - domestic_hot_water_burner_starts - - 2020-04-02T08:58:29+02:00 - - 4348 - - - - - 2020-04-01T09:58:10.148+02:00 - domestic_hot_water_setpoint - C - 2019-05-14T20:03:51.811+02:00 - - 60.00 - - - - - 2020-04-01T09:58:09.946+02:00 - open_therm_application_specific_fault_code - - 2020-04-01T05:20:02.497+02:00 - - 0 - - - - - 2020-04-02T09:49:04.751+02:00 - return_water_temperature - C - 2020-04-02T09:49:04.751+02:00 - - 42.00 - - - - - 2020-04-02T08:55:49.305+02:00 - domestic_hot_water_state - - 2020-04-02T08:55:49.305+02:00 - - on - - - - - 2020-04-01T09:58:09.977+02:00 - maximum_boiler_temperature - C - 2020-04-01T05:20:03.542+02:00 - - 70.00 - - - - - 2020-04-02T09:47:04.657+02:00 - central_heating_state - - 2020-04-02T09:47:04.657+02:00 - - on - - - - - 2020-04-02T08:00:00+02:00 - burner_efficiency - s - 2020-04-02T08:00:00+02:00 - PT1H - - 2682 - - - - - 2020-04-02T08:33:57.435+02:00 - intended_central_heating_state - - 2020-04-02T08:33:57.435+02:00 - - off - - - - - 2020-04-01T09:58:09.949+02:00 - open_therm_oem_fault_code - - 2019-05-14T20:03:45.705+02:00 - - 0 - - - - - 2020-04-02T09:45:26.337+02:00 - modulation_level - - 2020-04-01T23:19:16.599+02:00 - - 0.00 - - - - - 2020-04-02T08:58:28+02:00 - burner_starts - - 2020-04-02T08:58:28+02:00 - - 11456 - - - - - 2020-04-02T08:58:35+02:00 - burner_operation_time - hr - 2020-04-02T08:58:35+02:00 - - 926 - - - - - 2020-04-02T09:47:04+02:00 - burner_efficiency - s - 2020-04-02T09:47:04+02:00 - - 2898 - - - - - 2020-04-02T09:44:17.359+02:00 - open_therm_oem_diagnostic_code - - 2020-04-02T09:44:17.358+02:00 - - 204 - - - - - 2020-04-02T08:58:49.500+02:00 - central_heater_water_pressure - bar - 2020-04-02T08:58:49.500+02:00 - - 2.10 - - - - - - - 2020-04-01T09:58:10.148+02:00 - domestic_hot_water_setpoint - 60 - 30 - 60 - 0.01 - - - - - - 2020-04-01T09:58:10.130+02:00 - domestic_hot_water_comfort_mode - off - - - 2020-04-01T09:58:09.977+02:00 - maximum_boiler_temperature - 70 - 0 - 100 - 1 - - - - - - - Anna - A thermostat - thermostat - 2019-01-31T10:06:52.274+01:00 - 2020-04-02T09:49:23.085+02:00 - - - - - - 2019-05-14T20:14:15.490+02:00 - proximity_detection - - 2019-05-14T20:14:15.490+02:00 - - no_proximity_detected - - - - - 2020-04-02T09:49:29.749+02:00 - decentral_heat_demand_offset - C - 2020-04-01T05:20:03.697+02:00 - - 0.00 - - - - - 2020-04-01T09:58:10.276+02:00 - open_therm_boiler_activation_threshold - C - 2019-05-14T20:04:03.321+02:00 - - 10.00 - - - - - 2020-04-02T09:49:29.723+02:00 - temperature - C - 2020-04-02T09:45:34.137+02:00 - - 20.48 - - - - - 2020-04-01T09:58:10.284+02:00 - derivative_coefficient - s - 2020-04-01T05:20:03.770+02:00 - - 0 - - - - - 2020-04-01T09:58:10.278+02:00 - onoff_boiler_temperature_deadband - C - 2019-05-14T21:30:11.826+02:00 - - 0.70 - - - - - 2020-04-02T08:33:04.730+02:00 - preset_state - - 2020-04-02T08:33:04.730+02:00 - - home - - - - - 2020-04-02T08:33:20+02:00 - cpu_frequency - Hz - 2020-04-02T08:33:20+02:00 - - 8000000 - - - - - 2020-03-22T20:55:51.287+01:00 - button_right - - 2020-03-22T20:55:51.287+01:00 - - up - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Bosch Thermotechniek B.V. - 2.32 - - - 2019-05-14T20:03:36.453+02:00 - 2020-04-01T05:20:02.787+02:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.0 - true - false - false - false - true - false - smart_grid_off - off - - - - diff --git a/userdata/anna_without_boiler_fw441/core.appliances.xml b/userdata/anna_without_boiler_fw441/core.appliances.xml deleted file mode 100644 index 5fbdfd95a..000000000 --- a/userdata/anna_without_boiler_fw441/core.appliances.xml +++ /dev/null @@ -1,362 +0,0 @@ - - - - Anna - A thermostat - thermostat - 2019-04-23T20:32:36.648+02:00 - 2023-12-10T18:48:32.036+01:00 - - - - - - cpu_frequency - Hz - 2023-12-10T18:46:57+01:00 - 2023-12-10T18:46:57+01:00 - - - - 8000000 - - - - proximity_detection - - 2023-12-10T18:25:52.867+01:00 - 2023-12-10T18:25:52.867+01:00 - - - - no_proximity_detected - - - - temperature_offset - C - 2023-11-20T21:00:52.018+01:00 - 2023-11-20T21:00:52.018+01:00 - - - - 0.00 - - - - temperature - C - 2023-12-10T18:47:05.611+01:00 - 2023-12-10T18:47:05.611+01:00 - PT3H - - - 19.08 - - - - button_right - - 2023-12-08T16:50:35.139+01:00 - 2023-12-08T16:50:35.139+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2019-01-31T12:18:34.950+01:00 - 2021-10-27T05:27:14.088+02:00 - - - - - - - - - - - - - - - - - - - - Plugwise - ThermoExtension - 6539-1301-2302 - 2018-02-08T11:15:57+01:00 - 2019-01-31T12:18:32.804+01:00 - 2019-04-23T20:33:05.222+02:00 - - - - - - - diff --git a/userdata/fail_firmware/.!17497!core.domain_objects.xml b/userdata/fail_firmware/.!17497!core.domain_objects.xml deleted file mode 100644 index e69de29bb..000000000 diff --git a/userdata/p1v4/.!18232!core.domain_objects.xml b/userdata/p1v4/.!18232!core.domain_objects.xml deleted file mode 100644 index e69de29bb..000000000 diff --git a/userdata/p1v4/core.appliances.xml b/userdata/p1v4/core.appliances.xml deleted file mode 100644 index 8d9cc06b7..000000000 --- a/userdata/p1v4/core.appliances.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - Gateway - Container for variables logged about the Gateway in general. - gateway - 2019-11-19T10:21:26.199+01:00 - 2020-11-03T18:32:55+01:00 - - - - - signal_strength - dBm - 2020-11-03T18:32:54.963+01:00 - 2020-11-03T18:32:54.963+01:00 - - - - -73.00 - - - - link_quality - - 2020-11-03T18:32:54.963+01:00 - 2020-11-03T18:32:54.963+01:00 - - - - 37 - - - - wlan_state - - 2020-11-03T18:32:54.964+01:00 - 2020-11-01T03:03:00.285+01:00 - - - - up - - - - lan_state - - 2020-11-03T18:32:55+01:00 - 2020-03-12T16:40:25.650+01:00 - - - - down - - - - wlan_ip_address - - 2020-11-03T18:32:54.964+01:00 - 2020-11-03T03:01:37+01:00 - - - - 127.0.0.1 - - - - - - - - diff --git a/userdata/p1v4/core.direct_objects.xml b/userdata/p1v4/core.direct_objects.xml deleted file mode 100644 index 741750f7f..000000000 --- a/userdata/p1v4/core.direct_objects.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - - Home - A building with a smart meter. - building - 2020-03-12T16:41:36.227+01:00 - 2020-11-03T18:35:22.436+01:00 - - home - - - - - electricity_consumed - W - 2020-11-03T18:35:18+01:00 - 2020-11-03T18:35:18+01:00 - - - - 0.00 - 543.00 - - - - electricity_produced - Wh - 2020-11-03T18:35:00+01:00 - 2020-11-03T18:35:00+01:00 - - - - 0.00 - 0.00 - - - - electricity_produced - W - 2020-11-03T18:35:18+01:00 - 2020-11-03T07:00:00+01:00 - - - - 0.00 - 0.00 - - - - electricity_consumed - Wh - 2020-11-03T18:35:00+01:00 - 2020-11-03T18:35:00+01:00 - - - - 9067554.00 - 11915899.00 - - - - electricity_produced - Wh - 2020-11-03T18:00:00+01:00 - 2020-11-03T17:00:00+01:00 - PT1H - - - 0.00 - 0.00 - - - - electricity_consumed - Wh - 2020-11-03T18:00:00+01:00 - 2020-11-03T17:00:00+01:00 - PT1H - - - 335.00 - 0.00 - - - - - - - Gateway - Container for variables logged about the Gateway in general. - gateway - 2019-11-19T10:21:26.199+01:00 - 2020-11-03T18:32:55+01:00 - - - - - signal_strength - dBm - 2020-11-03T18:32:54.963+01:00 - 2020-11-03T18:32:54.963+01:00 - - - - -73.00 - - - - link_quality - - 2020-11-03T18:32:54.963+01:00 - 2020-11-03T18:32:54.963+01:00 - - - - 37 - - - - wlan_state - - 2020-11-03T18:32:54.964+01:00 - 2020-11-01T03:03:00.285+01:00 - - - - up - - - - lan_state - - 2020-11-03T18:32:55+01:00 - 2020-03-12T16:40:25.650+01:00 - - - - down - - - - wlan_ip_address - - 2020-11-03T18:32:54.964+01:00 - 2020-11-03T03:01:37+01:00 - - - - 127.0.0.1 - - - - - - - - diff --git a/userdata/p1v4/core.locations.xml b/userdata/p1v4/core.locations.xml deleted file mode 100644 index 0d732a499..000000000 --- a/userdata/p1v4/core.locations.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - Home - A building with a smart meter. - building - 2020-03-12T16:41:36.227+01:00 - 2020-11-03T18:35:52.740+01:00 - - home - - - - - electricity_consumed - W - 2020-11-03T18:35:48+01:00 - 2020-11-03T18:35:48+01:00 - - - - 0.00 - 548.00 - - - - electricity_produced - Wh - 2020-11-03T18:35:00+01:00 - 2020-11-03T18:35:00+01:00 - - - - 0.00 - 0.00 - - - - electricity_produced - W - 2020-11-03T18:35:48+01:00 - 2020-11-03T07:00:00+01:00 - - - - 0.00 - 0.00 - - - - electricity_consumed - Wh - 2020-11-03T18:35:00+01:00 - 2020-11-03T18:35:00+01:00 - - - - 9067554.00 - 11915899.00 - - - - electricity_produced - Wh - 2020-11-03T18:00:00+01:00 - 2020-11-03T17:00:00+01:00 - PT1H - - - 0.00 - 0.00 - - - - electricity_consumed - Wh - 2020-11-03T18:00:00+01:00 - 2020-11-03T17:00:00+01:00 - PT1H - - - 335.00 - 0.00 - - - - - - - - diff --git a/userdata/p1v4/core.modules.xml b/userdata/p1v4/core.modules.xml deleted file mode 100644 index d7bd22d69..000000000 --- a/userdata/p1v4/core.modules.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - SHENZHEN KAIFA TECHNOLOGY CHENGDU CO. - KFM5KAIFA-METER - - - 2020-03-12T16:41:36.010+01:00 - 2020-08-10T09:32:42.108+02:00 - - - - - - - - - - - - - - - E0025100029832815 - 42 - - - - - - Plugwise - Gateway - AME Smile 2.0 board - - 2019-11-19T10:21:25.346+01:00 - 2020-03-12T16:45:21.960+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/userdata/p1v4_442_single/core.appliances.xml b/userdata/p1v4_442_single/core.appliances.xml deleted file mode 100644 index 8e344a4fc..000000000 --- a/userdata/p1v4_442_single/core.appliances.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - Gateway - Container for variables logged about the Gateway in general. - gateway - 2019-11-19T10:21:26.199+01:00 - 2022-12-24T10:15:43.205+01:00 - - - - - signal_strength - dBm - 2022-12-24T10:15:43.164+01:00 - 2022-12-24T10:15:43.164+01:00 - - - - -71.00 - - - - link_quality - - 2022-12-24T10:15:43.164+01:00 - 2022-12-24T10:15:43.164+01:00 - - - - 39 - - - - wlan_state - - 2022-12-24T10:15:43.165+01:00 - 2022-12-24T10:15:43.165+01:00 - - - - up - - - - lan_state - - 2022-12-24T10:15:37.058+01:00 - 2022-12-24T10:15:37.058+01:00 - - - - down - - - - lan_ip_address - - 2022-12-24T10:15:37+01:00 - 2022-12-24T10:15:37+01:00 - - - - 0.0.0.0 - - - - wlan_ip_address - - 2022-12-24T10:15:43+01:00 - 2022-12-24T10:15:43+01:00 - - - - 127.0.0.1 - - - - - - diff --git a/userdata/p1v4_442_single/core.locations.xml b/userdata/p1v4_442_single/core.locations.xml deleted file mode 100644 index b5616af10..000000000 --- a/userdata/p1v4_442_single/core.locations.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - Home - A building with a smart meter. - building - 2020-03-12T16:41:36.227+01:00 - 2022-12-24T10:08:10.823+01:00 - - home - - - - - electricity_phase_one_produced - W - 2022-12-24T10:08:05+01:00 - 2022-12-24T10:08:05+01:00 - - - - 0.00 - - - - electricity_consumed - W - 2022-12-24T10:08:05+01:00 - 2022-12-24T10:08:05+01:00 - - - - 0.00 - 421.00 - - - - electricity_produced - Wh - 2022-12-24T10:08:00+01:00 - 2022-12-24T10:08:00+01:00 - - - - 0.00 - 0.00 - - - - electricity_phase_one_consumed - W - 2022-12-24T10:08:05+01:00 - 2022-12-24T10:08:05+01:00 - - - - 413.00 - - - - electricity_produced - W - 2022-12-24T10:08:05+01:00 - 2022-12-24T10:08:05+01:00 - - - - 0.00 - 0.00 - - - - electricity_consumed - Wh - 2022-12-24T10:08:00+01:00 - 2022-12-24T10:08:00+01:00 - - - - 13966608.00 - 17643505.00 - - - - electricity_produced - Wh - 2022-12-24T10:05:00+01:00 - 2022-12-24T10:00:00+01:00 - PT5M - - - 0.00 - 0.00 - - - - electricity_consumed - Wh - 2022-12-24T10:05:00+01:00 - 2022-12-24T10:00:00+01:00 - PT5M - - - 0.00 - 21.00 - - - - - - diff --git a/userdata/p1v4_442_single/core.modules.xml b/userdata/p1v4_442_single/core.modules.xml deleted file mode 100644 index 142220804..000000000 --- a/userdata/p1v4_442_single/core.modules.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - SHENZHEN KAIFA TECHNOLOGY （CHENGDU） CO., LTD. - KFM5KAIFA-METER - - - 2020-03-12T16:41:36.010+01:00 - 2022-12-07T15:59:23.409+01:00 - - - - - - - - - - - - - - - - - - E0025100029832815 - 42 - - - - - - Plugwise - Gateway - AME Smile 2.0 board - - 2019-11-19T10:21:25.346+01:00 - 2021-04-10T01:39:26.828+02:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/userdata/p1v4_442_triple/core.appliances.xml b/userdata/p1v4_442_triple/core.appliances.xml deleted file mode 100644 index 8182e45f9..000000000 --- a/userdata/p1v4_442_triple/core.appliances.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - Gateway C49300137E6F - Container for variables logged about the Gateway in general. - gateway - 2020-01-30T12:13:48.968+01:00 - 2022-12-24T10:15:47.222+01:00 - - - - - lan_ip_address - - 2022-12-24T10:15:47+01:00 - 2022-12-24T10:15:47+01:00 - - - - 0.0.0.0 - - - - wlan_ip_address - - 2022-12-24T10:15:36+01:00 - 2022-12-24T10:15:36+01:00 - - - - 127.0.0.1 - - - - wlan_state - - 2022-12-24T10:15:36.277+01:00 - 2022-12-24T10:15:36.277+01:00 - - - - up - - - - lan_state - - 2022-12-24T10:15:47.200+01:00 - 2022-12-24T10:15:47.200+01:00 - - - - down - - - - link_quality - - 2022-12-24T10:15:36.276+01:00 - 2022-12-24T10:15:36.276+01:00 - - - - 41 - - - - signal_strength - dBm - 2022-12-24T10:15:36.276+01:00 - 2022-12-24T10:15:36.276+01:00 - - - - -69.00 - - - - - - diff --git a/userdata/p1v4_442_triple/core.locations.xml b/userdata/p1v4_442_triple/core.locations.xml deleted file mode 100644 index 6e7c81f2a..000000000 --- a/userdata/p1v4_442_triple/core.locations.xml +++ /dev/null @@ -1,210 +0,0 @@ - - - - Home - A building with a smart meter. - building - 2020-05-20T14:47:55.693+02:00 - 2022-12-24T10:09:22.791+01:00 - - home - - - - - electricity_produced - Wh - 2022-12-24T10:09:00+01:00 - 2022-12-24T10:09:00+01:00 - - - - 0.00 - 0.00 - - - - voltage_phase_three - V - 2022-12-24T10:09:22+01:00 - 2022-12-24T10:09:22+01:00 - - - - 234.70 - - - - voltage_phase_one - V - 2022-12-24T10:09:22+01:00 - 2022-12-24T10:09:22+01:00 - - - - 233.20 - - - - electricity_phase_one_consumed - W - 2022-12-24T10:09:22+01:00 - 2022-12-24T10:09:22+01:00 - - - - 1763.00 - - - - electricity_consumed - Wh - 2022-12-24T10:05:00+01:00 - 2022-12-24T10:00:00+01:00 - PT5M - - - 0.00 - 314.00 - - - - electricity_phase_two_consumed - W - 2022-12-24T10:09:22+01:00 - 2022-12-24T10:09:22+01:00 - - - - 1703.00 - - - - electricity_phase_two_produced - W - 2022-12-24T10:09:22+01:00 - 2022-12-24T10:09:22+01:00 - - - - 0.00 - - - - electricity_phase_one_produced - W - 2022-12-24T10:09:22+01:00 - 2022-12-24T10:09:22+01:00 - - - - 0.00 - - - - gas_consumed - m3 - 2022-12-24T10:00:00+01:00 - 2022-12-24T09:00:00+01:00 - PT1H - - - 0.06 - - - - electricity_phase_three_consumed - W - 2022-12-24T10:09:22+01:00 - 2022-12-24T10:09:22+01:00 - - - - 2080.00 - - - - electricity_produced - Wh - 2022-12-24T10:05:00+01:00 - 2022-12-24T10:00:00+01:00 - PT5M - - - 0.00 - 0.00 - - - - voltage_phase_two - V - 2022-12-24T10:09:22+01:00 - 2022-12-24T10:09:22+01:00 - - - - 234.40 - - - - electricity_consumed - W - 2022-12-24T10:09:22+01:00 - 2022-12-24T10:09:22+01:00 - - - - 0.00 - 5553.00 - - - - gas_consumed - m3 - 2022-12-24T10:05:00+01:00 - 2022-12-24T10:05:00+01:00 - - - - 16811.37 - - - - electricity_consumed - Wh - 2022-12-24T10:09:00+01:00 - 2022-12-24T10:09:00+01:00 - - - - 161328641.00 - 70537898.00 - - - - electricity_phase_three_produced - W - 2022-12-24T10:09:22+01:00 - 2022-12-24T10:09:22+01:00 - - - - 0.00 - - - - electricity_produced - W - 2022-12-24T10:09:22+01:00 - 2022-12-24T10:09:22+01:00 - - - - 0.00 - 0.00 - - - - - - diff --git a/userdata/p1v4_442_triple/core.modules.xml b/userdata/p1v4_442_triple/core.modules.xml deleted file mode 100644 index 7362b0c2c..000000000 --- a/userdata/p1v4_442_triple/core.modules.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - Plugwise - Gateway - AME Smile 2.0 board - - 2020-01-30T12:13:48.508+01:00 - 2021-04-09T01:20:48.634+02:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2020-05-20T14:47:57.682+02:00 - 2020-05-20T14:47:58.290+02:00 - - - - - - - - - - - - G0039001919375719 - - - - - - XEMEX NV - XMX5LGF0010453051839 - - - 2020-05-20T14:47:55.458+02:00 - 2022-11-09T07:59:47.938+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - E0052005305183919 - 50 - - - - - diff --git a/userdata/updated/adam_plus_anna_new/core.appliances.xml b/userdata/updated/adam_plus_anna_new/core.appliances.xml deleted file mode 100644 index 3bc1cd7f6..000000000 --- a/userdata/updated/adam_plus_anna_new/core.appliances.xml +++ /dev/null @@ -1,953 +0,0 @@ - - - - SmartPlug Floor 0 - A device that communicates through the ZigBee protocol. - 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 - - - - - - electricity_consumed - Wh - 2023-12-22T16:15:00+01:00 - 2023-12-22T16:00:00+01:00 - PT15M - - - 0.00 - - - - electricity_produced - Wh - - - PT15M - - - - relay - - 2023-12-22T16:18:09.841+01:00 - 2022-06-11T15:25:12.796+02:00 - - - - on - - - - - - 2023-12-22T16:18:09.841+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 - 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 - 2023-12-22T16:30:19.645+01:00 - - - - - - - - thermostat - C - 2023-12-22T16:30:00.357+01:00 - 2023-12-22T16:30:00.357+01:00 - - - - 18.50 - - - - intended_domestic_hot_water_comfort_mode - - 2023-12-22T16:27:51.647+01:00 - 2023-12-22T16:27:51.647+01:00 - - - - on - - - - intended_central_heating_state - - 2023-12-22T16:27:51.647+01:00 - 2023-12-22T16:27:51.647+01:00 - - - - off - - - - temperature - C - 2023-12-22T16:30:19.629+01:00 - 2023-12-22T16:30:19.629+01:00 - PT3H - - - 18.36 - - - - maximum_modulation_level - - 2021-12-18T10:33:33.788+01:00 - 2021-12-18T10:33:32.832+01:00 - - - - 1.00 - - - - - - 2023-12-22T16:30:00.358+01:00 - thermostat - 1 - 35 - 0.01 - 18.5 - - - - - - - Central heating boiler - - heater_central - 2021-12-16T19:30:21.331+01:00 - 2023-12-22T16:30:27.732+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 - 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 - - 2023-12-19T10:05:37.544+01:00 - 2023-12-19T10:05:37.544+01:00 - - - - off - - - - central_heating_state - - 2023-12-22T16:30:24.455+01:00 - 2023-12-22T16:30:24.455+01:00 - - - - on - - - - intended_central_heating_state - - 2023-12-22T16:30:02.548+01:00 - 2023-12-22T16:30:02.548+01:00 - - - - on - - - - failed_burner_flame_ignitions - - 2023-03-24T14:52:56+01:00 - 2023-03-24T14:52:56+01: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 - - - - 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 - - 2023-12-22T11:11:02.869+01:00 - 2023-12-22T11:11:02.868+01:00 - - - - 255 - - - - burner_operation_time - s - 2023-12-22T16:00:00+01:00 - 2023-12-22T15:00:00+01:00 - PT1H - - - 16 - - - - burner_operation_time - hr - 2023-12-22T12:35:33+01:00 - 2023-12-22T12:35:33+01:00 - - - - 10721 - - - - domestic_hot_water_comfort_mode - - 2023-08-17T00:05:50.772+02:00 - 2023-08-17T00:05:50.772+02:00 - - - - off - - - - flame_state - - 2023-12-22T16:30:24.472+01:00 - 2023-12-22T16:30:24.472+01:00 - - - - on - - - - cooling_enabled - - 2023-12-10T11:40:02.026+01:00 - 2023-12-10T11:40:02.026+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 - - 2023-12-22T11:11:02.869+01:00 - 2023-12-22T11:11:02.868+01:00 - - - - 0 - - - - - - - 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 Werkplek - A smart plug that can be switched on/off and measure power usage. - computer_desktop - 2021-12-16T19:30:42.936+01:00 - 2023-12-22T16:30:24.573+01:00 - - - - - - - - electricity_produced - 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:24.542+01:00 - 2023-12-22T16:30:24.542+01:00 - - - - 0.00 - - - - relay - - 2023-12-22T16:24:29.783+01:00 - 2023-12-22T16:24:29.783+01:00 - - - - off - - - - electricity_consumed - Wh - 2023-12-22T16:15:00+01:00 - 2023-12-22T16:00:00+01:00 - PT15M - - - 0.00 - - - - electricity_consumed - W - 2023-12-22T16:30:24.542+01:00 - 2023-12-22T16:30:24.542+01:00 - - - - 0.00 - - - - - - 2023-12-22T16:24:29.783+01:00 - false - off - - - - - - Tom Badkamer - 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 - 2023-12-22T16:22:29.987+01:00 - - - - - - thermostat - C - 2023-12-22T07:02:11.280+01:00 - 2023-12-22T07:02:11.280+01:00 - - - - 18.00 - - - - temperature_difference - C - 2023-12-22T15:31:28.848+01:00 - 2023-12-22T15:31:28.848+01:00 - - - - -0.20 - - - - temperature - C - 2023-12-22T16:22:29.981+01:00 - 2023-12-22T16:22:29.981+01:00 - PT3H - - - 17.56 - - - - battery - - 2023-12-22T10:13:07.513+01:00 - 2023-12-22T10:13:07.513+01:00 - - - - 0.99 - - - - temperature_offset - C - 2023-12-13T09:39:02.838+01:00 - 2023-12-13T09:39:02.838+01:00 - - - - 0.10 - - - - valve_position - - 2023-12-22T04:32:11.454+01:00 - 2023-12-22T04:32:11.454+01:00 - - - - 1.00 - - - - uncorrected_temperature - C - 2023-12-22T16:22:29.981+01:00 - 2023-12-22T16:22:29.981+01:00 - - - - 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 - - - - 0.00 - - - - 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 - - - 0.00 - - - - relay - - 2023-12-22T16:29:30.555+01:00 - 2023-12-22T16:29:30.555+01:00 - - - - off - - - - electricity_produced - Wh - 2023-12-22T16:15:00+01:00 - 2023-12-22T16:00:00+01:00 - PT15M - - - 0.00 - - - - - - 2023-12-22T16:29:30.555+01:00 - false - off - - - - - - OpenThermGateway - An OpenTherm Gateway - open_therm_gateway - 2021-12-16T19:30:28.533+01:00 - 2023-12-17T18:34:07.141+01:00 - - - - - override_mode - - 2023-12-17T18:34:07.138+01:00 - 2023-12-17T18:34:07.138+01:00 - - - - on - - - - open_therm_power_mode - - 2023-08-17T00:05:59.286+02:00 - 2023-08-17T00:05:59.286+02:00 - - - - 0 - - - - - - - Gateway - Container for variables logged about the Gateway in general. - gateway - 2021-12-16T19:30:16.149+01:00 - 2023-12-22T16:27:33.624+01:00 - - - - - signal_strength - dBm - 2023-12-22T16:26:50.907+01:00 - 2023-12-22T16:26:50.907+01:00 - - - - -62.00 - - - - link_quality - - 2023-12-22T16:26:50.907+01:00 - 2023-12-22T16:26:50.907+01:00 - - - - 48 - - - - lan_state - - 2023-12-22T16:27:33.603+01:00 - 2023-12-22T16:27:33.603+01:00 - - - - down - - - - wlan_state - - 2023-12-22T16:26:50.908+01:00 - 2023-12-22T16:26:50.908+01:00 - - - - up - - - - regulation_mode - - 2023-12-10T11:40:02.539+01:00 - 2023-07-28T20:28:08.585+02:00 - - - - off - - - - lan_ip_address - - 2023-12-22T16:27:33+01:00 - 2023-12-22T16:27:33+01:00 - - - - 0.0.0.0 - - - - gateway_mode - - 2023-12-02T11:35:46.017+01:00 - - - - - full - - - - wlan_ip_address - - 2023-12-22T16:26:50+01:00 - 2023-12-22T16:26:50+01:00 - - - - 127.0.0.1 - - - - - - - 2023-12-10T11:40:02.539+01:00 - regulation_mode - off - - bleeding_hot - bleeding_cold - off - heating - - - - - 2023-12-02T11:35:46.017+01:00 - gateway_mode - full - - full - - setup - light - secure - away - vacation - - - - - diff --git a/userdata/updated/adam_plus_anna_new/core.locations.xml b/userdata/updated/adam_plus_anna_new/core.locations.xml deleted file mode 100644 index 013528b93..000000000 --- a/userdata/updated/adam_plus_anna_new/core.locations.xml +++ /dev/null @@ -1,235 +0,0 @@ - - - - Home - - building - 2021-12-16T19:30:17.225+01:00 - 2023-12-22T16:18:55.645+01:00 - - home - - - - - weather_description - - 2023-12-22T16:13:01+01:00 - 2023-12-22T16:13:01+01:00 - - - - rain - - - - humidity - RH - 2023-12-22T16:13:01+01:00 - 2023-12-22T16:13:01+01:00 - PT3H - - - 90.00 - - - - solar_irradiance - W_m2 - 2023-12-22T16:13:01+01:00 - 2023-12-22T16:13:01+01:00 - - - - 3.00 - - - - wind_vector - m_s - 2023-12-22T16:13:01+01:00 - 2023-12-22T16:13:01+01:00 - - - - (6.26,291.00) - - - - outdoor_temperature - C - 2023-12-22T16:13:01+01:00 - 2023-12-22T16:13:01+01:00 - PT3H - - - 9.19 - - - - - - - Bathroom - - bathroom - 2021-12-16T19:37:57.444+01:00 - 2023-12-22T16:18:09.849+01:00 - - home - - - - - - - - relay - - - - - - - electricity_produced - W - 2023-12-02T09:50:02.323+01:00 - 2023-08-16T23:58:55.515+02:00 - - - 0.00 - - - - temperature - C - 2023-12-22T16:18:09.838+01:00 - 2023-08-16T23:52:07.632+02:00 - PT3H - - 16.50 - - - - thermostat - C - 2023-12-22T07:00:05.510+01:00 - 2023-08-16T20:58:30.470+02:00 - - - 18.00 - - - - electricity_consumed - W - 2023-12-02T09:50:02.323+01:00 - 2023-08-16T23:58:55.515+02:00 - - - 0.00 - - - - - - 2023-12-22T07:00:00.321+01:00 - thermostat - 0 - 99.9 - 0.01 - 18 - - true - true - preheating - passive - - - - - Living room - The room containing the (central) home thermostat. - livingroom - 2021-12-16T19:30:56.643+01:00 - 2023-12-22T16:31:09.658+01:00 - - home - - - - - - - - - - temperature - C - 2023-12-22T16:31:05.873+01:00 - 2023-08-17T00:01:50.312+02:00 - PT3H - - 18.33 - - - - thermostat - - 2023-12-22T16:31:01.839+01:00 - 2023-08-17T00:01:46.191+02:00 - - - 18.50 - - - - electricity_consumed - W - 2023-12-22T16:31:09.616+01:00 - 2023-08-16T23:53:22.531+02:00 - - - 147.81 - - - - relay - - - - - - - electricity_produced - W - 2023-12-22T16:31:09.616+01:00 - 2023-08-16T23:53:22.531+02:00 - - - 0.00 - - - - - - - false - single - - - 2023-12-22T16:30:00.358+01:00 - thermostat - 1 - 35 - 0.01 - 18.5 - - true - true - heating - active - - - - diff --git a/userdata/updated/adam_plus_anna_new/core.modules.xml b/userdata/updated/adam_plus_anna_new/core.modules.xml deleted file mode 100644 index 3549785c8..000000000 --- a/userdata/updated/adam_plus_anna_new/core.modules.xml +++ /dev/null @@ -1,527 +0,0 @@ - - - - LUMI - lumi.plug.maeu01 - - - - 2022-03-11T11:21:37.406+01:00 - 2022-03-11T18:44:23.929+01:00 - - - - - - - - - - - - 54EF4410002C97F2 - router - true - mains - - - - 63 - 1 - sibling - - - 75 - 1 - sibling - - - 67 - 0 - parent - - - 2023-12-22T16:24:36+01:00 - true - - - - - Telegesis - ETRX3587-LRS - - - 2021-12-16T19:30:38.437+01:00 - 2022-11-03T11:35:39.755+01:00 - - - - - 000D6F000D5A168D - false - - - 255 - 15 - None of the above - - - 255 - 1 - child - - - 255 - 15 - None of the above - - - 255 - 1 - child - - - 255 - 15 - None of the above - - - 2023-12-22T16:24:36+01:00 - true - - - - - - Plugwise - 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 - - - - - - - - - - - - 16-50-001-505 - - - - - - - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - 000D6F000C8FF5EE - end_device - false - battery - false - false - - 0 - - - - false - - - - - Plugwise - 160-01 - - 2020-11-10T01:00:00+01:00 - - 2021-12-16T19:30:41.519+01:00 - 2021-12-16T19:30:48.319+01:00 - - - - - - - - - - - - - - - 000D6F000D13CB6F - router - true - mains - - - - 255 - 15 - None of the above - - - 255 - 15 - None of the above - - - 255 - 0 - None of the above - - - 2023-12-22T16:02:27+01:00 - true - - - - - - - - - 2021-12-16T19:30:16.990+01:00 - 2021-12-16T19:30:17.206+01:00 - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - 160-01 - - 2020-11-10T01:00:00+01:00 - - 2021-12-16T19:30:41.080+01:00 - 2021-12-16T19:30:48.412+01:00 - - - - - - - - - - - - - - - 000D6F000D13CCFD - router - true - mains - - - - 255 - 15 - None of the above - - - 255 - 15 - None of the above - - - 255 - 0 - None of the above - - - 2023-12-22T16:28:31+01:00 - true - - - - - - - - - 2021-12-16T19:30:21.157+01:00 - 2022-11-03T11:34:40.387+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.0 - smart_grid_off - off - - - - - Plugwise - Gateway - AME Smile 2.0 board - - 2021-12-16T19:30:15.834+01:00 - 2021-12-16T19:30:29.447+01:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - 158-01 - 255 - 2016-10-10T02:00:00+02:00 - - 2021-12-16T19:30:47.185+01:00 - 2021-12-16T19:31:12.823+01:00 - - - - - - - - - - - - - - - - - - 000D6F000C869B61 - end_device - true - battery - - - - false - - - - - Plugwise B.V. - 143.1 - - - 2021-12-16T19:30:51.982+01:00 - 2021-12-18T10:33:32.029+01:00 - - - - - - - - - - - - - - - - - - - - - 0.0 - - - - - - Plugwise - 160-01 - - 2020-11-10T01:00:00+01:00 - - 2021-12-16T19:30:41.293+01:00 - 2023-12-17T09:31:18.033+01:00 - - - - - - - - - - - - - - - 000D6F000D13CA9A - router - true - mains - - - - 255 - 15 - None of the above - - - 255 - 15 - None of the above - - - 255 - 0 - None of the above - - - 2023-12-22T16:05:44+01:00 - true - - - - diff --git a/userdata/updated/anna_heatpump_heating/core.appliances.xml b/userdata/updated/anna_heatpump_heating/core.appliances.xml deleted file mode 100644 index bcb92ee3e..000000000 --- a/userdata/updated/anna_heatpump_heating/core.appliances.xml +++ /dev/null @@ -1,1293 +0,0 @@ - - - - Central heating boiler - - heater_central - 2019-08-29T20:18:24.141+02:00 - 2020-04-09T14:10:05.574+02:00 - - - - - 2020-04-01T01:29:31.824+02:00 - night_reduction - - 2019-08-29T20:59:52.274+02:00 - - on - - - - - 2020-04-01T01:29:31.674+02:00 - first_fan_enabled - - 2019-08-29T20:19:52.760+02:00 - - off - - - - - 2020-04-09T13:25:18.838+02:00 - hibernation_lead_time - hr - 2020-04-01T01:33:42.860+02:00 - - 10 - - - - - 2020-04-01T01:29:31.818+02:00 - boiler_enabled - - 2019-08-31T09:39:37.817+02:00 - - off - - - - - 2020-04-09T14:09:54.218+02:00 - slave_boiler_state - - 2020-04-01T09:24:19.878+02:00 - - off - - - - - 2020-04-09T14:10:05.571+02:00 - domestic_hot_water_temperature - C - 2020-04-09T14:10:05.571+02:00 - - 46.34 - - - - - 2020-04-09T13:25:35.107+02:00 - maximum_outdoor_unit_power_increase_temperature - C - 2020-04-01T01:33:43.584+02:00 - - 43.00 - - - - - 2020-04-09T14:08:11.233+02:00 - return_water_temperature - C - 2020-04-09T14:08:11.233+02:00 - - 25.09 - - - - - 2020-04-01T01:29:31.810+02:00 - thermostat_supports_cooling - - 2019-09-03T13:09:35.966+02:00 - - on - - - - - 2020-04-01T01:29:31.643+02:00 - input_contacts_installed - - 2019-08-29T20:19:45.527+02:00 - - on - - - - - 2020-04-09T14:09:02.597+02:00 - boiler_temperature - C - 2020-04-09T14:09:02.597+02:00 - - 29.09 - - - - - 2020-04-01T01:29:31.830+02:00 - underfloor_heating - - 2019-08-29T20:19:42.677+02:00 - - on - - - - - 2020-04-09T13:25:27.332+02:00 - weather_dependent_maximum_supply_temperature - C - 2019-08-29T20:19:22.989+02:00 - - 60.00 - - - - - - temperature - C - - - - - 2020-04-09T13:25:20.096+02:00 - maximum_heating_supply_temperature - C - 2019-08-29T20:29:35.116+02:00 - - 40.00 - - - - - 2020-04-09T13:25:31.429+02:00 - maximum_outdoor_unit_temperature - C - 2019-08-29T20:19:21.338+02:00 - - 47.00 - - - - - 2020-04-01T01:29:31.692+02:00 - boiler_installed - - 2019-08-29T20:19:54.246+02:00 - - on - - - - - 2020-04-09T13:25:30.736+02:00 - internal_pump_heating_lead_time - s - 2019-08-29T20:18:54.646+02:00 - - 60 - - - - - 2020-04-01T01:29:31.664+02:00 - temperature_sensor_enabled - - 2019-08-29T20:19:49.846+02:00 - - off - - - - - 2020-04-01T01:29:31.652+02:00 - second_fan_enabled - - 2019-08-29T20:19:48.386+02:00 - - off - - - - - 2020-04-09T13:33:10+02:00 - burner_efficiency - s - 2020-04-09T13:33:10+02:00 - - 7372 - - - - - 2020-04-09T13:25:19.455+02:00 - minimum_boiler_run_time - s - 2020-04-01T01:33:43.099+02:00 - - 20 - - - - - 2020-04-08T22:30:51.045+02:00 - cooling_state - - 2020-04-08T22:30:51.045+02:00 - - off - - - - - 2020-04-09T14:06:36.049+02:00 - outdoor_temperature - C - 2020-04-09T13:51:55.147+02:00 - - 3.00 - - - - - 2020-04-09T13:25:30.119+02:00 - boiler_activation_threshold - Cmin - 2020-04-01T01:33:44.534+02:00 - - 30 - - - - - 2020-04-09T13:27:29.096+02:00 - flame_state - - 2020-04-09T13:27:29.096+02:00 - - off - - - - - 2020-04-01T01:29:31.806+02:00 - thermostat_enabled - - 2019-08-29T20:19:33.125+02:00 - - off - - - - - 2020-04-09T13:25:31.144+02:00 - cooling_lower_offset - C - 2019-08-29T20:19:05.905+02:00 - - 1.00 - - - - - 2020-04-01T01:29:31.670+02:00 - serial_boiler_installation - - 2019-08-29T20:19:51.287+02:00 - - off - - - - - 2020-04-08T19:24:39.363+02:00 - intended_boiler_temperature - C - 2020-04-03T07:54:47.729+02:00 - - 35.00 - - - - - 2020-04-09T14:09:54.416+02:00 - compressor_state - - 2020-04-09T12:47:28.377+02:00 - - on - - - - - 2020-04-09T13:27:29.089+02:00 - domestic_hot_water_state - - 2020-04-09T13:27:29.089+02:00 - - off - - - - - 2020-04-08T19:24:38.964+02:00 - maximum_boiler_temperature - C - 2020-04-01T01:33:34.763+02:00 - - 60.00 - - - - - 2020-04-01T01:29:31.630+02:00 - weather_dependent_regulation - - 2019-08-29T20:19:44.096+02:00 - - off - - - - - 2020-04-09T13:25:30.965+02:00 - minimum_cooling_supply_temperature - C - 2020-04-01T01:33:41.488+02:00 - - 17.00 - - - - - 2020-04-09T14:10:17.399+02:00 - refrigerent_out_temperature - C - 2020-04-08T19:24:42.196+02:00 - - 0.00 - - - - - 2020-04-08T19:24:38.879+02:00 - open_therm_application_specific_fault_code - - 2019-08-29T20:18:32.180+02:00 - - 0 - - - - - 2020-04-09T13:25:35.453+02:00 - cooling_upper_offset - C - 2019-08-29T20:19:04.518+02:00 - - 3.00 - - - - - 2020-04-09T13:25:32.819+02:00 - maximum_outdoor_unit_steady_temperature - C - 2019-08-29T20:19:19.739+02:00 - - 45.00 - - - - - 2020-04-09T13:25:16.208+02:00 - night_reduction_setpoint - C - 2020-04-01T01:33:40.889+02:00 - - 19.00 - - - - - 2020-04-09T13:25:08.411+02:00 - heatpump_minimum_outdoor_temperature - C - 2020-01-17T11:43:19.781+01:00 - - -2.00 - - - - - 2020-04-09T13:57:28.568+02:00 - domestic_hot_water_flow - l_min - 2020-04-09T13:27:28.022+02:00 - - 1.80 - - - - - 2020-04-09T14:10:09.380+02:00 - elga_outdoor_unit_fault_code - - 2019-08-29T20:19:27.308+02:00 - - 0 - - - - - 2020-04-09T13:51:50.028+02:00 - central_heating_state - - 2020-04-09T13:33:10.885+02:00 - - on - - - - - 2020-04-09T13:25:28.684+02:00 - external_pump_heating_lead_time - s - 2019-08-29T20:18:55.914+02:00 - - 60 - - - - - 2020-04-09T13:25:35.254+02:00 - minimum_boiler_off_time - s - 2019-08-29T20:19:16.554+02:00 - - 20 - - - - - 2020-04-01T01:29:31.827+02:00 - simultaneous_boiler_operation - - 2019-08-29T20:19:41.300+02:00 - - on - - - - - 2020-04-09T13:25:10.891+02:00 - boiler_minimum_outdoor_temperature - C - 2020-02-29T20:48:58.629+01:00 - - 14.00 - - - - - 2020-04-01T01:29:31.649+02:00 - outdoor_temperature_used - - 2019-08-29T21:06:01.315+02:00 - - on - - - - - 2020-04-09T14:10:09.625+02:00 - refrigerent_in_temperature - C - 2020-04-09T13:49:22.114+02:00 - - 29.00 - - - - - 2020-04-09T14:05:35.969+02:00 - central_heater_water_pressure - bar - 2020-04-09T13:05:35.581+02:00 - - 1.57 - - - - - 2020-04-09T13:25:28.067+02:00 - external_pump_cooling_lead_time - s - 2020-04-01T01:33:40.027+02:00 - - 120 - - - - - 2020-04-01T01:29:31.814+02:00 - heating_curve - - 2019-08-29T20:19:35.765+02:00 - - off - - - - - - burner_operation_time - s - - PT1H - - - - 2020-04-09T13:25:28.306+02:00 - internal_pump_cooling_lead_time - s - 2019-08-29T20:18:57.196+02:00 - - 120 - - - - - 2020-04-09T13:25:18.431+02:00 - indoor_temperature_transition_time - min - 2020-04-01T01:33:40.436+02:00 - - 5 - - - - - 2020-04-01T01:29:31.821+02:00 - hibernation_enabled - - 2019-08-29T20:19:38.531+02:00 - - off - - - - - 2020-04-09T13:25:18.634+02:00 - pump_lag_time - s - 2019-08-29T20:18:59.850+02:00 - - 30 - - - - - 2020-04-09T14:06:55.441+02:00 - modulation_level - - 2020-04-09T13:51:50.024+02:00 - - 0.52 - - - - - 2020-04-08T19:24:38.882+02:00 - open_therm_oem_fault_code - - 2020-04-02T08:56:10.125+02:00 - - 0 - - - - - 2020-04-09T12:00:00+02:00 - burner_efficiency - s - 2020-04-09T12:00:00+02:00 - PT1H - - 8562 - - - - - 2020-04-09T14:10:15.513+02:00 - elga_status_code - - 2020-04-09T12:44:36.599+02:00 - - 3 - - - - - 2020-04-08T19:24:39.142+02:00 - domestic_hot_water_setpoint - C - 2019-08-31T14:24:28.426+02:00 - - 60.00 - - - - - 2020-04-08T19:24:39.018+02:00 - domestic_hot_water_comfort_mode - - 2019-09-05T08:22:57.660+02:00 - - off - - - - - 2020-04-09T13:25:27.895+02:00 - maximum_cooling_supply_temperature - C - 2019-08-29T20:19:08.960+02:00 - - 21.00 - - - - - 2020-04-09T13:25:27.706+02:00 - minimum_heating_supply_temperature - C - 2019-09-06T13:34:41.651+02:00 - - 20.00 - - - - - 2020-04-08T19:24:39.011+02:00 - intended_central_heating_state - - 2020-04-03T07:54:23.120+02:00 - - off - - - - - 2020-04-09T14:10:01.382+02:00 - open_therm_slave_oem_fault_code - - 2019-08-29T20:19:29.035+02:00 - - 0 - - - - - cooling_enabled - - 2022-11-02T03:57:23.207+01:00 - 2022-11-02T03:57:23.207+01:00 - - - - off - - - - - - - 2022-11-02T03:57:23.207+01:00 - cooling_enabled - off - - - - 2020-04-09T13:25:31.144+02:00 - cooling_lower_offset - 1 - - - 2020-04-09T13:25:10.891+02:00 - boiler_minimum_outdoor_temperature - 14 - -10 - 40 - 1 - - - - - - 2020-04-09T13:25:30.119+02:00 - boiler_activation_threshold - 30 - 10 - 120 - 10 - - - 2020-04-09T13:25:27.332+02:00 - weather_dependent_maximum_supply_temperature - 60 - 30 - 90 - 10 - - - - - - 2020-04-09T13:25:18.838+02:00 - hibernation_lead_time - 10 - 1 - 24 - 1 - - - - 2020-04-09T13:25:18.431+02:00 - indoor_temperature_transition_time - 5 - 0 - 30 - 1 - - - 2020-04-09T13:25:27.895+02:00 - maximum_cooling_supply_temperature - 21 - 5 - 25 - 1 - - - - - 2020-04-09T13:25:35.107+02:00 - maximum_outdoor_unit_power_increase_temperature - 43 - 25 - 43 - 1 - - - - - - 2020-04-09T13:25:18.634+02:00 - pump_lag_time - 30 - 10 - 240 - 10 - - - 2020-04-09T13:25:08.411+02:00 - heatpump_minimum_outdoor_temperature - -2 - -16 - 4 - 1 - - - - - 2020-04-08T19:24:38.964+02:00 - maximum_boiler_temperature - 60 - 0 - 100 - 1 - - - - - - domestic_hot_water_setpoint - 35 - 60 - 0.01 - - - - - - 2020-04-09T13:25:35.254+02:00 - minimum_boiler_off_time - 20 - 0 - 60 - 5 - - - - 2020-04-09T13:25:28.067+02:00 - external_pump_cooling_lead_time - 120 - 120 - 240 - 10 - - - - 2020-04-09T13:25:28.684+02:00 - external_pump_heating_lead_time - 60 - 10 - 240 - 10 - - - - 2020-04-09T13:25:35.453+02:00 - cooling_upper_offset - 3 - - - 2020-04-09T13:25:16.208+02:00 - night_reduction_setpoint - 19 - 1 - 30 - 1 - - - - - 2020-04-09T13:25:20.096+02:00 - maximum_heating_supply_temperature - 40 - 20 - 90 - 5 - - - - - 2020-04-09T13:25:27.706+02:00 - minimum_heating_supply_temperature - 20 - 20 - 90 - 5 - - - - - 2020-04-09T13:25:30.965+02:00 - minimum_cooling_supply_temperature - 17 - 5 - 25 - 1 - - - - - - 2020-04-09T13:25:30.736+02:00 - internal_pump_heating_lead_time - 60 - 10 - 240 - 10 - - - 2020-04-09T13:25:32.819+02:00 - maximum_outdoor_unit_steady_temperature - 45 - 25 - 45 - 1 - - - - - - 2020-04-09T13:25:19.455+02:00 - minimum_boiler_run_time - 20 - 0 - 60 - 5 - - - 2020-04-09T13:25:31.429+02:00 - maximum_outdoor_unit_temperature - 47 - 25 - 47 - 1 - - - - - - 2020-04-08T19:24:39.018+02:00 - domestic_hot_water_comfort_mode - off - - - - 2020-04-09T13:25:28.306+02:00 - internal_pump_cooling_lead_time - 120 - 120 - 240 - 10 - - - - - Gateway C4930004224C - Container for variables logged about the Gateway in general. - gateway - 2019-01-31T12:00:34.582+01:00 - 2020-04-09T14:09:59.906+02:00 - - - - - 2020-04-09T14:09:59.869+02:00 - wlan_state - - 2020-04-09T08:04:19.567+02:00 - - up - - - - - 2020-04-09T14:09:59.868+02:00 - link_quality - - 2020-04-09T14:09:59.868+02:00 - - 47 - - - - - 2020-04-09T14:10:03.283+02:00 - lan_state - - 2020-03-30T21:45:12.242+02:00 - - up - - - - - 2020-04-09T14:09:59.868+02:00 - signal_strength - dBm - 2020-04-09T14:09:59.868+02:00 - - -63.00 - - - - - 2020-04-09T14:09:59.869+02:00 - wlan_ip_address - - 2020-02-26T21:11:41+01:00 - - 127.0.0.1 - - - - - 2020-04-09T14:10:03.283+02:00 - lan_ip_address - - 2020-03-21T01:21:13+01:00 - - 127.0.0.1 - - - - - - - - Anna - A thermostat - thermostat - 2019-01-31T12:00:40.511+01:00 - 2020-04-09T14:12:19.501+02:00 - - - - - - 2020-04-09T13:27:29.070+02:00 - intended_domestic_hot_water_comfort_mode - - 2020-04-01T01:33:34.802+02:00 - - off - - - - - 2020-04-09T14:12:19.497+02:00 - temperature - C - 2020-04-09T14:12:19.497+02:00 - - 19.30 - - - - - 2020-04-08T19:24:39.484+02:00 - temperature_offset - C - 2020-03-25T10:12:42.718+01:00 - - -0.50 - - - - - 2020-04-06T15:26:46.949+02:00 - button_right - - 2020-04-06T15:26:46.949+02:00 - - up - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Plugwise - ThermoExtension - 6539-1301-2304 - 2018-02-08T11:15:57+01:00 - 2019-01-31T12:00:35.226+01:00 - 2019-01-31T12:03:29.884+01:00 - - - - - - - - Plugwise - Gateway - AME Smile 2.0 board - - 2019-01-31T12:00:30.328+01:00 - 2019-08-29T19:42:34.068+02:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - Techneco - - - - 2019-08-29T20:18:23.942+02:00 - 2020-04-06T10:56:42.505+02:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.0 - true - false - false - false - true - false - smart_grid_off - circulation_heat - - - - - - - - - 2019-01-31T12:00:30.650+01:00 - 2020-04-01T01:33:46.562+02:00 - - - - - - - - - - - - - - - - - - - - - - - diff --git a/userdata/updated/anna_v4/core.appliances.xml b/userdata/updated/anna_v4/core.appliances.xml deleted file mode 100644 index cfaf16165..000000000 --- a/userdata/updated/anna_v4/core.appliances.xml +++ /dev/null @@ -1,569 +0,0 @@ - - - - Central heating boiler - - heater_central - 2019-05-14T20:03:36.683+02:00 - 2020-04-02T09:49:39.969+02:00 - - - - - 2020-04-02T09:40:45.299+02:00 - domestic_hot_water_flow - l_min - 2020-04-02T08:55:43.781+02:00 - - 0.00 - - - - - 2020-04-02T09:49:39.966+02:00 - flame_state - - 2020-04-02T09:49:39.966+02:00 - - off - - - - - 2020-04-02T08:58:29+02:00 - domestic_hot_water_burner_operation_time - hr - 2020-04-02T08:58:29+02:00 - - 105 - - - - - 2020-04-02T09:49:04.111+02:00 - boiler_temperature - C - 2020-04-02T09:49:04.111+02:00 - - 51.00 - - - - - 2020-04-02T09:49:04.772+02:00 - intended_boiler_temperature - C - 2020-04-02T09:49:04.772+02:00 - - 0.00 - - - - - 2020-04-01T09:58:10.130+02:00 - domestic_hot_water_comfort_mode - - 2019-05-17T09:11:06.126+02:00 - - on - - - - - - burner_operation_time - s - - PT1H - - - - 2020-04-02T08:58:29+02:00 - domestic_hot_water_burner_starts - - 2020-04-02T08:58:29+02:00 - - 4348 - - - - - 2020-04-01T09:58:10.148+02:00 - domestic_hot_water_setpoint - C - 2019-05-14T20:03:51.811+02:00 - - 59.00 - - - - - 2020-04-01T09:58:09.946+02:00 - open_therm_application_specific_fault_code - - 2020-04-01T05:20:02.497+02:00 - - 0 - - - - - 2020-04-02T09:49:04.751+02:00 - return_water_temperature - C - 2020-04-02T09:49:04.751+02:00 - - 41.00 - - - - - 2020-04-02T08:55:49.305+02:00 - domestic_hot_water_state - - 2020-04-02T08:55:49.305+02:00 - - off - - - - - 2020-04-01T09:58:09.977+02:00 - maximum_boiler_temperature - C - 2020-04-01T05:20:03.542+02:00 - - 69.00 - - - - - 2020-04-02T09:47:04.657+02:00 - central_heating_state - - 2020-04-02T09:47:04.657+02:00 - - off - - - - - 2020-04-02T08:00:00+02:00 - burner_efficiency - s - 2020-04-02T08:00:00+02:00 - PT1H - - 2682 - - - - - 2020-04-02T08:33:57.435+02:00 - intended_central_heating_state - - 2020-04-02T08:33:57.435+02:00 - - off - - - - - 2020-04-01T09:58:09.949+02:00 - open_therm_oem_fault_code - - 2019-05-14T20:03:45.705+02:00 - - 0 - - - - - 2020-04-02T09:45:26.337+02:00 - modulation_level - - 2020-04-01T23:19:16.599+02:00 - - 0.00 - - - - - 2020-04-02T08:58:28+02:00 - burner_starts - - 2020-04-02T08:58:28+02:00 - - 11456 - - - - - 2020-04-02T08:58:35+02:00 - burner_operation_time - hr - 2020-04-02T08:58:35+02:00 - - 926 - - - - - 2020-04-02T09:47:04+02:00 - burner_efficiency - s - 2020-04-02T09:47:04+02:00 - - 2898 - - - - - 2020-04-02T09:44:17.359+02:00 - open_therm_oem_diagnostic_code - - 2020-04-02T09:44:17.358+02:00 - - 204 - - - - - 2020-04-02T08:58:49.500+02:00 - central_heater_water_pressure - bar - 2020-04-02T08:58:49.500+02:00 - - 2.10 - - - - - - - 2020-04-01T09:58:10.148+02:00 - domestic_hot_water_setpoint - 59 - 30 - 60 - 0.01 - - - - - - 2020-04-01T09:58:10.130+02:00 - domestic_hot_water_comfort_mode - on - - - 2020-04-01T09:58:09.977+02:00 - maximum_boiler_temperature - 69 - 0 - 100 - 1 - - - - - - - Anna - A thermostat - thermostat - 2019-01-31T10:06:52.274+01:00 - 2020-04-02T09:49:23.085+02:00 - - - - - - 2019-05-14T20:14:15.490+02:00 - proximity_detection - - 2019-05-14T20:14:15.490+02:00 - - no_proximity_detected - - - - - 2020-04-02T09:49:29.749+02:00 - decentral_heat_demand_offset - C - 2020-04-01T05:20:03.697+02:00 - - 0.00 - - - - - 2020-04-01T09:58:10.276+02:00 - open_therm_boiler_activation_threshold - C - 2019-05-14T20:04:03.321+02:00 - - 10.00 - - - - - 2020-04-02T09:49:29.723+02:00 - temperature - C - 2020-04-02T09:45:34.137+02:00 - - 19.48 - - - - - 2020-04-01T09:58:10.284+02:00 - derivative_coefficient - s - 2020-04-01T05:20:03.770+02:00 - - 0 - - - - - 2020-04-01T09:58:10.278+02:00 - onoff_boiler_temperature_deadband - C - 2019-05-14T21:30:11.826+02:00 - - 0.70 - - - - - 2020-04-02T08:33:04.730+02:00 - preset_state - - 2020-04-02T08:33:04.730+02:00 - - away - - - - - 2020-04-02T08:33:20+02:00 - cpu_frequency - Hz - 2020-04-02T08:33:20+02:00 - - 8000000 - - - - - 2020-03-22T20:55:51.287+01:00 - button_right - - 2020-03-22T20:55:51.287+01:00 - - up - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Bosch Thermotechniek B.V. - 2.32 - - - 2019-05-14T20:03:36.453+02:00 - 2020-04-01T05:20:02.787+02:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0.0 - true - false - false - false - true - false - smart_grid_off - off - - - - diff --git a/userdata/updated/p1v4_442_single/core.appliances.xml b/userdata/updated/p1v4_442_single/core.appliances.xml deleted file mode 100644 index 8e344a4fc..000000000 --- a/userdata/updated/p1v4_442_single/core.appliances.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - Gateway - Container for variables logged about the Gateway in general. - gateway - 2019-11-19T10:21:26.199+01:00 - 2022-12-24T10:15:43.205+01:00 - - - - - signal_strength - dBm - 2022-12-24T10:15:43.164+01:00 - 2022-12-24T10:15:43.164+01:00 - - - - -71.00 - - - - link_quality - - 2022-12-24T10:15:43.164+01:00 - 2022-12-24T10:15:43.164+01:00 - - - - 39 - - - - wlan_state - - 2022-12-24T10:15:43.165+01:00 - 2022-12-24T10:15:43.165+01:00 - - - - up - - - - lan_state - - 2022-12-24T10:15:37.058+01:00 - 2022-12-24T10:15:37.058+01:00 - - - - down - - - - lan_ip_address - - 2022-12-24T10:15:37+01:00 - 2022-12-24T10:15:37+01:00 - - - - 0.0.0.0 - - - - wlan_ip_address - - 2022-12-24T10:15:43+01:00 - 2022-12-24T10:15:43+01:00 - - - - 127.0.0.1 - - - - - - diff --git a/userdata/updated/p1v4_442_single/core.locations.xml b/userdata/updated/p1v4_442_single/core.locations.xml deleted file mode 100644 index 1a69348af..000000000 --- a/userdata/updated/p1v4_442_single/core.locations.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - Home - A building with a smart meter. - building - 2020-03-12T16:41:36.227+01:00 - 2022-12-24T10:08:10.823+01:00 - - home - - - - - electricity_phase_one_produced - W - 2022-12-24T10:08:05+01:00 - 2022-12-24T10:08:05+01:00 - - - - 1998.00 - - - - electricity_consumed - W - 2022-12-24T10:08:05+01:00 - 2022-12-24T10:08:05+01:00 - - - - 0.00 - 0.00 - - - - electricity_produced - Wh - 2022-12-24T10:08:00+01:00 - 2022-12-24T10:08:00+01:00 - - - - 6543.00 - 0.00 - - - - electricity_phase_one_consumed - W - 2022-12-24T10:08:05+01:00 - 2022-12-24T10:08:05+01:00 - - - - 0.00 - - - - electricity_produced - W - 2022-12-24T10:08:05+01:00 - 2022-12-24T10:08:05+01:00 - - - - 2248.00 - 0.00 - - - - electricity_consumed - Wh - 2022-12-24T10:08:00+01:00 - 2022-12-24T10:08:00+01:00 - - - - 13966608.00 - 17643505.00 - - - - electricity_produced - Wh - 2022-12-24T10:05:00+01:00 - 2022-12-24T10:00:00+01:00 - PT5M - - - 1345.00 - 0.00 - - - - electricity_consumed - Wh - 2022-12-24T10:05:00+01:00 - 2022-12-24T10:00:00+01:00 - PT5M - - - 0.00 - 0.00 - - - - - - diff --git a/userdata/updated/p1v4_442_single/core.modules.xml b/userdata/updated/p1v4_442_single/core.modules.xml deleted file mode 100644 index 142220804..000000000 --- a/userdata/updated/p1v4_442_single/core.modules.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - SHENZHEN KAIFA TECHNOLOGY （CHENGDU） CO., LTD. - KFM5KAIFA-METER - - - 2020-03-12T16:41:36.010+01:00 - 2022-12-07T15:59:23.409+01:00 - - - - - - - - - - - - - - - - - - E0025100029832815 - 42 - - - - - - Plugwise - Gateway - AME Smile 2.0 board - - 2019-11-19T10:21:25.346+01:00 - 2021-04-10T01:39:26.828+02:00 - - - - - - - - - - - - - - - - - - - - - - - - - - - From 096fcf52d8abb11221f5cd6879003eb2ff8fb3ec Mon Sep 17 00:00:00 2001 From: Bouwe Date: Mon, 8 Jan 2024 19:45:06 +0100 Subject: [PATCH 078/306] Re-add legacy-related code - keep function common --- plugwise/helper.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugwise/helper.py b/plugwise/helper.py index 22e32a5fb..0a191db2b 100644 --- a/plugwise/helper.py +++ b/plugwise/helper.py @@ -136,6 +136,10 @@ async def _request_validate(self, resp: ClientResponse, method: str) -> etree: if resp.status == 202: return + # Cornercase for stretch not responding with 202 + if method == "put" and resp.status == 200: + return + if resp.status == 401: msg = "Invalid Plugwise login, please retry with the correct credentials." LOGGER.error("%s", msg) @@ -171,6 +175,8 @@ async def _request( if method == "delete": resp = await self._websession.delete(url, auth=self._auth) if method == "get": + # Work-around for Stretchv2, should not hurt the other smiles + use_headers = {"Accept-Encoding": "gzip"} resp = await self._websession.get( url, headers=use_headers, auth=self._auth ) From 7fa0ad62ea290aa6c2825184369bd041c0ff609c Mon Sep 17 00:00:00 2001 From: Bouwe Date: Tue, 9 Jan 2024 19:57:52 +0100 Subject: [PATCH 079/306] Limit to ADAM --- plugwise/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugwise/__init__.py b/plugwise/__init__.py index d8de37e9f..da36c218e 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -126,7 +126,8 @@ def get_all_devices(self) -> None: # Gather all the devices and their initial data self._all_appliances() if self._is_thermostat: - self._scan_thermostats() + if self.smile(ADAM): + self._scan_thermostats() # Collect a list of thermostats with offset-capability self.therms_with_offset_func = ( self._get_appliances_with_offset_functionality() From 974c011db7619bb38ea1f0830ca475b5234d9c37 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Fri, 19 Jan 2024 17:50:24 +0100 Subject: [PATCH 080/306] Disable legacy-related test-code --- tests/test_init.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/test_init.py b/tests/test_init.py index 096fb02f9..cc8ecc8ea 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -117,12 +117,12 @@ async def setup_app( "DELETE", CORE_NOTIFICATIONS_TAIL, self.smile_http_accept ) app.router.add_route("PUT", CORE_RULES_TAIL, self.smile_http_accept) - if not stretch: - app.router.add_route( - "PUT", CORE_APPLIANCES_TAIL, self.smile_http_accept - ) - else: - app.router.add_route("PUT", CORE_APPLIANCES_TAIL, self.smile_http_ok) +# if not stretch: + app.router.add_route( + "PUT", CORE_APPLIANCES_TAIL, self.smile_http_accept + ) +# else: +# app.router.add_route("PUT", CORE_APPLIANCES_TAIL, self.smile_http_ok) else: app.router.add_route("PUT", CORE_LOCATIONS_TAIL, self.smile_timeout) app.router.add_route("PUT", CORE_RULES_TAIL, self.smile_timeout) @@ -193,11 +193,11 @@ async def smile_http_accept(cls, request): text = EMPTY_XML raise aiohttp.web.HTTPAccepted(text=text) - @classmethod - async def smile_http_ok(cls, request): - """Render generic API calling endpoint.""" - text = EMPTY_XML - raise aiohttp.web.HTTPOk(text=text) +# @classmethod +# async def smile_http_ok(cls, request): +# """Render generic API calling endpoint.""" +# text = EMPTY_XML +# raise aiohttp.web.HTTPOk(text=text) @classmethod async def smile_timeout(cls, request): From a76969091153e5c163d96920620ccfe83777fd3d Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 20 Jan 2024 09:20:22 +0100 Subject: [PATCH 081/306] Move get_all_devices() into the main Smile class --- plugwise/__init__.py | 48 +++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/plugwise/__init__.py b/plugwise/__init__.py index da36c218e..cc3cbd495 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -117,29 +117,6 @@ def _update_for_cooling(self, device: DeviceData) -> None: sensors["setpoint_high"] = temp_dict["setpoint_high"] self._count += 2 - def get_all_devices(self) -> None: - """Determine the evices present from the obtained XML-data. - - Run this functions once to gather the initial device configuration, - then regularly run async_update() to refresh the device data. - """ - # Gather all the devices and their initial data - self._all_appliances() - if self._is_thermostat: - if self.smile(ADAM): - self._scan_thermostats() - # Collect a list of thermostats with offset-capability - self.therms_with_offset_func = ( - self._get_appliances_with_offset_functionality() - ) - - # Collect and add switching- and/or pump-group devices - if group_data := self._get_group_switches(): - self.gw_devices.update(group_data) - - # Collect the remaining data for all devices - self._all_device_data() - def _all_device_data(self) -> None: """Helper-function for get_all_devices(). @@ -475,6 +452,29 @@ def _get_plugwise_notifications(self) -> None: f"{self._endpoint}{DOMAIN_OBJECTS}", ) + def get_all_devices(self) -> None: + """Determine the evices present from the obtained XML-data. + + Run this functions once to gather the initial device configuration, + then regularly run async_update() to refresh the device data. + """ + # Gather all the devices and their initial data + self._all_appliances() + if self._is_thermostat: + if self.smile(ADAM): + self._scan_thermostats() + # Collect a list of thermostats with offset-capability + self.therms_with_offset_func = ( + self._get_appliances_with_offset_functionality() + ) + + # Collect and add switching- and/or pump-group devices + if group_data := self._get_group_switches(): + self.gw_devices.update(group_data) + + # Collect the remaining data for all devices + self._all_device_data() + async def async_update(self) -> PlugwiseData: """Perform an incremental update for updating the various device states.""" # Perform a full update at day-change @@ -504,6 +504,8 @@ def determine_contexts( return etree.tostring(contexts, encoding="unicode").rstrip() +### API Set and HA Service-related Functions + async def set_schedule_state( self, loc_id: str, From dc80398438a44df8ffec428790aefb8d0bb40abc Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 20 Jan 2024 09:31:31 +0100 Subject: [PATCH 082/306] Reorganize function-blocks --- plugwise/__init__.py | 72 +++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/plugwise/__init__.py b/plugwise/__init__.py index cc3cbd495..5544e98bf 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -485,26 +485,9 @@ async def async_update(self) -> PlugwiseData: return PlugwiseData(self.gw_data, self.gw_devices) - def determine_contexts( - self, loc_id: str, name: str, state: str, sched_id: str - ) -> etree: - """Helper-function for set_schedule_state().""" - locator = f'.//*[@id="{sched_id}"]/contexts' - contexts = self._domain_objects.find(locator) - locator = f'.//*[@id="{loc_id}"].../...' - if (subject := contexts.find(locator)) is None: - subject = f'' - subject = etree.fromstring(subject) - - if state == "off": - self._last_active[loc_id] = name - contexts.remove(subject) - if state == "on": - contexts.append(subject) - - return etree.tostring(contexts, encoding="unicode").rstrip() - -### API Set and HA Service-related Functions +######################################################################################################## +### API Set and HA Service-related Functions ### +######################################################################################################## async def set_schedule_state( self, @@ -561,6 +544,25 @@ async def set_schedule_state( await self._request(uri, method="put", data=data) self._schedule_old_states[loc_id][name] = new_state + def determine_contexts( + self, loc_id: str, name: str, state: str, sched_id: str + ) -> etree: + """Helper-function for set_schedule_state().""" + locator = f'.//*[@id="{sched_id}"]/contexts' + contexts = self._domain_objects.find(locator) + locator = f'.//*[@id="{loc_id}"].../...' + if (subject := contexts.find(locator)) is None: + subject = f'' + subject = etree.fromstring(subject) + + if state == "off": + self._last_active[loc_id] = name + contexts.remove(subject) + if state == "on": + contexts.append(subject) + + return etree.tostring(contexts, encoding="unicode").rstrip() + async def set_preset(self, loc_id: str, preset: str) -> None: """Set the given Preset on the relevant Thermostat - from LOCATIONS.""" if (presets := self._presets(loc_id)) is None: @@ -652,21 +654,6 @@ async def set_temperature_offset(self, _: str, dev_id: str, offset: float) -> No await self._request(uri, method="put", data=data) - async def _set_groupswitch_member_state( - self, members: list[str], state: str, switch: Munch - ) -> None: - """Helper-function for set_switch_state(). - - Set the given State of the relevant Switch within a group of members. - """ - for member in members: - locator = f'appliance[@id="{member}"]/{switch.actuator}/{switch.func_type}' - switch_id = self._domain_objects.find(locator).attrib["id"] - uri = f"{APPLIANCES};id={member}/{switch.device};id={switch_id}" - data = f"<{switch.func_type}><{switch.func}>{state}" - - await self._request(uri, method="put", data=data) - async def set_switch_state( self, appl_id: str, members: list[str] | None, model: str, state: str ) -> None: @@ -716,6 +703,21 @@ async def set_switch_state( await self._request(uri, method="put", data=data) + async def _set_groupswitch_member_state( + self, members: list[str], state: str, switch: Munch + ) -> None: + """Helper-function for set_switch_state(). + + Set the given State of the relevant Switch within a group of members. + """ + for member in members: + locator = f'appliance[@id="{member}"]/{switch.actuator}/{switch.func_type}' + switch_id = self._domain_objects.find(locator).attrib["id"] + uri = f"{APPLIANCES};id={member}/{switch.device};id={switch_id}" + data = f"<{switch.func_type}><{switch.func}>{state}" + + await self._request(uri, method="put", data=data) + async def set_gateway_mode(self, mode: str) -> None: """Set the gateway mode.""" if mode not in self._gw_allowed_modes: From a7165caedf9536058bd57fa91d4200b91c008d73 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 20 Jan 2024 09:50:28 +0100 Subject: [PATCH 083/306] Revert back to full connect_function --- plugwise/__init__.py | 53 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/plugwise/__init__.py b/plugwise/__init__.py index 5544e98bf..e61678902 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -379,6 +379,8 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None: self.smile_hw_version = gateway.find("hardware_version").text self.smile_hostname = gateway.find("hostname").text self.smile_mac_address = gateway.find("mac_address").text + else: + model = await self._smile_detect_legacy(result, dsmrmain, model) if model == "Unknown" or self.smile_fw_version is None: # pragma: no cover # Corner case check @@ -411,6 +413,10 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None: self.smile_type = SMILES[self._target_smile].smile_type self.smile_version = (self.smile_fw_version, ver) + if self.smile_type == "stretch": + self._stretch_v2 = self.smile_version[1].major == 2 + self._stretch_v3 = self.smile_version[1].major == 3 + if self.smile_type == "thermostat": self._is_thermostat = True # For Adam, Anna, determine the system capabilities: @@ -431,6 +437,53 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None: if result.find(locator_2) is not None: self._elga = True + async def _smile_detect_legacy( + self, result: etree, dsmrmain: etree, model: str + ) -> str: + """Helper-function for _smile_detect().""" + return_model = model + # Stretch: find the MAC of the zigbee master_controller (= Stick) + if (network := result.find("./module/protocols/master_controller")) is not None: + self.smile_zigbee_mac_address = network.find("mac_address").text + # Find the active MAC in case there is an orphaned Stick + if zb_networks := result.findall("./network"): + for zb_network in zb_networks: + if zb_network.find("./nodes/network_router") is not None: + network = zb_network.find("./master_controller") + self.smile_zigbee_mac_address = network.find("mac_address").text + + # Legacy Anna or Stretch: + if ( + result.find('./appliance[type="thermostat"]') is not None + or network is not None + ): + self._system = await self._request(SYSTEM) + self.smile_fw_version = self._system.find("./gateway/firmware").text + return_model = self._system.find("./gateway/product").text + self.smile_hostname = self._system.find("./gateway/hostname").text + # If wlan0 contains data it's active, so eth0 should be checked last + for network in ("wlan0", "eth0"): + locator = f"./{network}/mac" + if (net_locator := self._system.find(locator)) is not None: + self.smile_mac_address = net_locator.text + # P1 legacy: + elif dsmrmain is not None: + self._status = await self._request(STATUS) + self.smile_fw_version = self._status.find("./system/version").text + return_model = self._status.find("./system/product").text + self.smile_hostname = self._status.find("./network/hostname").text + self.smile_mac_address = self._status.find("./network/mac_address").text + else: # pragma: no cover + # No cornercase, just end of the line + LOGGER.error( + "Connected but no gateway device information found, please create" + " an issue on http://github.com/plugwise/python-plugwise" + ) + raise ResponseError + + self._smile_legacy = True + return return_model + async def _full_update_device(self) -> None: """Perform a first fetch of all XML data, needed for initialization.""" self._domain_objects = await self._request(DOMAIN_OBJECTS) From d5538ac88bb76aec4013e6c993c6de900484d24e Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 20 Jan 2024 09:52:04 +0100 Subject: [PATCH 084/306] Re-add constant imports --- plugwise/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugwise/__init__.py b/plugwise/__init__.py index e61678902..b1469c1d9 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -32,7 +32,9 @@ OFF, RULES, SMILES, + STATUS, SWITCH_GROUP_TYPES, + SYSTEM, ZONE_THERMOSTATS, ActuatorData, DeviceData, From 6b7dcc7e2784d0c3201840454430a7952d96a6a6 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 20 Jan 2024 09:54:04 +0100 Subject: [PATCH 085/306] Add back missing self-inits --- plugwise/helper.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugwise/helper.py b/plugwise/helper.py index 0a191db2b..a93f546fe 100644 --- a/plugwise/helper.py +++ b/plugwise/helper.py @@ -233,7 +233,10 @@ def __init__(self) -> None: self._outdoor_temp: float self._reg_allowed_modes: list[str] = [] self._schedule_old_states: dict[str, dict[str, str]] = {} + self._smile_legacy = False self._status: etree + self._stretch_v2 = False + self._stretch_v3 = False self._system: etree self._thermo_locs: dict[str, ThermoLoc] = {} ################################################################### From b5b9edf46628bc0961ef674015a4ea4cbffc37a9 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 20 Jan 2024 10:14:26 +0100 Subject: [PATCH 086/306] Move SmileData class into data.py --- plugwise/__init__.py | 259 +---------------------------------------- plugwise/data.py | 271 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 273 insertions(+), 257 deletions(-) create mode 100644 plugwise/data.py diff --git a/plugwise/__init__.py b/plugwise/__init__.py index b1469c1d9..9069a20af 100644 --- a/plugwise/__init__.py +++ b/plugwise/__init__.py @@ -27,279 +27,24 @@ LOGGER, MAX_SETPOINT, MIN_SETPOINT, - NONE, NOTIFICATIONS, OFF, RULES, SMILES, STATUS, - SWITCH_GROUP_TYPES, SYSTEM, - ZONE_THERMOSTATS, - ActuatorData, DeviceData, GatewayData, PlugwiseData, ) +from .data import SmileData from .exceptions import ( InvalidSetupError, PlugwiseError, ResponseError, UnsupportedDeviceError, ) -from .helper import SmileComm, SmileHelper - - -def remove_empty_platform_dicts(data: DeviceData) -> None: - """Helper-function for removing any empty platform dicts.""" - if not data["binary_sensors"]: - data.pop("binary_sensors") - if not data["sensors"]: - data.pop("sensors") - if not data["switches"]: - data.pop("switches") - - -class SmileData(SmileHelper): - """The Plugwise Smile main class.""" - - def _update_gw_devices(self) -> None: - """Helper-function for _all_device_data() and async_update(). - - Collect data for each device and add to self.gw_devices. - """ - for device_id, device in self.gw_devices.items(): - data = self._get_device_data(device_id) - self._add_or_update_notifications(device_id, device, data) - device.update(data) - self._update_for_cooling(device) - remove_empty_platform_dicts(device) - - def _add_or_update_notifications( - self, device_id: str, device: DeviceData, data: DeviceData - ) -> None: - """Helper-function adding or updating the Plugwise notifications.""" - if ( - device_id == self.gateway_id - and ( - self._is_thermostat or self.smile_type == "power" - ) - ) or ( - "binary_sensors" in device - and "plugwise_notification" in device["binary_sensors"] - ): - data["binary_sensors"]["plugwise_notification"] = bool(self._notifications) - self._count += 1 - - def _update_for_cooling(self, device: DeviceData) -> None: - """Helper-function for adding/updating various cooling-related values.""" - # For Anna and heating + cooling, replace setpoint with setpoint_high/_low - if ( - self.smile(ANNA) - and self._cooling_present - and device["dev_class"] == "thermostat" - ): - thermostat = device["thermostat"] - sensors = device["sensors"] - temp_dict: ActuatorData = { - "setpoint_low": thermostat["setpoint"], - "setpoint_high": MAX_SETPOINT, - } - if self._cooling_enabled: - temp_dict = { - "setpoint_low": MIN_SETPOINT, - "setpoint_high": thermostat["setpoint"], - } - thermostat.pop("setpoint") - temp_dict.update(thermostat) - device["thermostat"] = temp_dict - if "setpoint" in sensors: - sensors.pop("setpoint") - sensors["setpoint_low"] = temp_dict["setpoint_low"] - sensors["setpoint_high"] = temp_dict["setpoint_high"] - self._count += 2 - - def _all_device_data(self) -> None: - """Helper-function for get_all_devices(). - - Collect data for each device and add to self.gw_data and self.gw_devices. - """ - self._update_gw_devices() - self.device_items = self._count - self.device_list = [] - for device in self.gw_devices: - self.device_list.append(device) - - self.gw_data.update( - { - "gateway_id": self.gateway_id, - "item_count": self._count, - "notifications": self._notifications, - "smile_name": self.smile_name, - } - ) - if self._is_thermostat: - self.gw_data.update( - {"heater_id": self._heater_id, "cooling_present": self._cooling_present} - ) - - def _device_data_switching_group( - self, device: DeviceData, data: DeviceData - ) -> None: - """Helper-function for _get_device_data(). - - Determine switching group device data. - """ - if device["dev_class"] in SWITCH_GROUP_TYPES: - counter = 0 - for member in device["members"]: - if self.gw_devices[member]["switches"].get("relay"): - counter += 1 - data["switches"]["relay"] = counter != 0 - self._count += 1 - - def _device_data_adam(self, device: DeviceData, data: DeviceData) -> None: - """Helper-function for _get_device_data(). - - Determine Adam heating-status for on-off heating via valves, - available regulations_modes and thermostat control_states. - """ - if self.smile(ADAM): - # Indicate heating_state based on valves being open in case of city-provided heating - if ( - device["dev_class"] == "heater_central" - and self._on_off_device - and isinstance(self._heating_valves(), int) - ): - data["binary_sensors"]["heating_state"] = self._heating_valves() != 0 - - # Show the allowed regulation modes and gateway_modes - if device["dev_class"] == "gateway": - if self._reg_allowed_modes: - data["regulation_modes"] = self._reg_allowed_modes - self._count += 1 - if self._gw_allowed_modes: - data["gateway_modes"] = self._gw_allowed_modes - self._count += 1 - - # Control_state, only for Adam master thermostats - if device["dev_class"] in ZONE_THERMOSTATS: - loc_id = device["location"] - if ctrl_state := self._control_state(loc_id): - data["control_state"] = ctrl_state - self._count += 1 - - def _device_data_climate(self, device: DeviceData, data: DeviceData) -> None: - """Helper-function for _get_device_data(). - - Determine climate-control device data. - """ - loc_id = device["location"] - - # Presets - data["preset_modes"] = None - data["active_preset"] = None - self._count += 2 - if presets := self._presets(loc_id): - data["preset_modes"] = list(presets) - data["active_preset"] = self._preset(loc_id) - - # Schedule - avail_schedules, sel_schedule = self._schedules(loc_id) - data["available_schedules"] = avail_schedules - data["select_schedule"] = sel_schedule - self._count += 2 - - # Operation modes: auto, heat, heat_cool, cool and off - data["mode"] = "auto" - self._count += 1 - if sel_schedule == NONE: - data["mode"] = "heat" - if self._cooling_present: - data["mode"] = "cool" if self.check_reg_mode("cooling") else "heat_cool" - - if self.check_reg_mode("off"): - data["mode"] = "off" - - if NONE not in avail_schedules: - self._get_schedule_states_with_off( - loc_id, avail_schedules, sel_schedule, data - ) - - def check_reg_mode(self, mode: str) -> bool: - """Helper-function for device_data_climate().""" - gateway = self.gw_devices[self.gateway_id] - return ( - "regulation_modes" in gateway and gateway["select_regulation_mode"] == mode - ) - - def _get_schedule_states_with_off( - self, location: str, schedules: list[str], selected: str, data: DeviceData - ) -> None: - """Collect schedules with states for each thermostat. - - Also, replace NONE by OFF when none of the schedules are active. - """ - loc_schedule_states: dict[str, str] = {} - for schedule in schedules: - loc_schedule_states[schedule] = "off" - if schedule == selected and data["mode"] == "auto": - loc_schedule_states[schedule] = "on" - self._schedule_old_states[location] = loc_schedule_states - - all_off = True - for state in self._schedule_old_states[location].values(): - if state == "on": - all_off = False - if all_off: - data["select_schedule"] = OFF - - def _check_availability( - self, device: DeviceData, dev_class: str, data: DeviceData, message: str - ) -> None: - """Helper-function for _get_device_data(). - - Provide availability status for the wired-commected devices. - """ - if device["dev_class"] == dev_class: - data["available"] = True - self._count += 1 - for item in self._notifications.values(): - for msg in item.values(): - if message in msg: - data["available"] = False - - def _get_device_data(self, dev_id: str) -> DeviceData: - """Helper-function for _all_device_data() and async_update(). - - Provide device-data, based on Location ID (= dev_id), from APPLIANCES. - """ - device = self.gw_devices[dev_id] - data = self._get_measurement_data(dev_id) - - # Check availability of wired-connected devices - # Smartmeter - self._check_availability( - device, "smartmeter", data, "P1 does not seem to be connected" - ) - # OpenTherm device - if device["name"] != "OnOff": - self._check_availability( - device, "heater_central", data, "no OpenTherm communication" - ) - - # Switching groups data - self._device_data_switching_group(device, data) - # Adam data - self._device_data_adam(device, data) - # Skip obtaining data for non master-thermostats - if device["dev_class"] not in ZONE_THERMOSTATS: - return data - - # Thermostat data (presets, temperatures etc) - self._device_data_climate(device, data) - - return data +from .helper import SmileComm class Smile(SmileComm, SmileData): diff --git a/plugwise/data.py b/plugwise/data.py new file mode 100644 index 000000000..9db09a306 --- /dev/null +++ b/plugwise/data.py @@ -0,0 +1,271 @@ +"""Use of this source code is governed by the MIT license found in the LICENSE file. + +Plugwise Smile protocol data-collection helpers. +""" +from __future__ import annotations + +from .constants import ( + ADAM, + ANNA, + MAX_SETPOINT, + MIN_SETPOINT, + NONE, + OFF, + SWITCH_GROUP_TYPES, + ZONE_THERMOSTATS, + ActuatorData, + DeviceData, +) +from .helper import SmileHelper + + +def remove_empty_platform_dicts(data: DeviceData) -> None: + """Helper-function for removing any empty platform dicts.""" + if not data["binary_sensors"]: + data.pop("binary_sensors") + if not data["sensors"]: + data.pop("sensors") + if not data["switches"]: + data.pop("switches") + + +class SmileData(SmileHelper): + """The Plugwise Smile main class.""" + + def _update_gw_devices(self) -> None: + """Helper-function for _all_device_data() and async_update(). + + Collect data for each device and add to self.gw_devices. + """ + for device_id, device in self.gw_devices.items(): + data = self._get_device_data(device_id) + self._add_or_update_notifications(device_id, device, data) + device.update(data) + self._update_for_cooling(device) + remove_empty_platform_dicts(device) + + def _add_or_update_notifications( + self, device_id: str, device: DeviceData, data: DeviceData + ) -> None: + """Helper-function adding or updating the Plugwise notifications.""" + if ( + device_id == self.gateway_id + and ( + self._is_thermostat or self.smile_type == "power" + ) + ) or ( + "binary_sensors" in device + and "plugwise_notification" in device["binary_sensors"] + ): + data["binary_sensors"]["plugwise_notification"] = bool(self._notifications) + self._count += 1 + + def _update_for_cooling(self, device: DeviceData) -> None: + """Helper-function for adding/updating various cooling-related values.""" + # For Anna and heating + cooling, replace setpoint with setpoint_high/_low + if ( + self.smile(ANNA) + and self._cooling_present + and device["dev_class"] == "thermostat" + ): + thermostat = device["thermostat"] + sensors = device["sensors"] + temp_dict: ActuatorData = { + "setpoint_low": thermostat["setpoint"], + "setpoint_high": MAX_SETPOINT, + } + if self._cooling_enabled: + temp_dict = { + "setpoint_low": MIN_SETPOINT, + "setpoint_high": thermostat["setpoint"], + } + thermostat.pop("setpoint") + temp_dict.update(thermostat) + device["thermostat"] = temp_dict + if "setpoint" in sensors: + sensors.pop("setpoint") + sensors["setpoint_low"] = temp_dict["setpoint_low"] + sensors["setpoint_high"] = temp_dict["setpoint_high"] + self._count += 2 + + def _all_device_data(self) -> None: + """Helper-function for get_all_devices(). + + Collect data for each device and add to self.gw_data and self.gw_devices. + """ + self._update_gw_devices() + self.device_items = self._count + self.device_list = [] + for device in self.gw_devices: + self.device_list.append(device) + + self.gw_data.update( + { + "gateway_id": self.gateway_id, + "item_count": self._count, + "notifications": self._notifications, + "smile_name": self.smile_name, + } + ) + if self._is_thermostat: + self.gw_data.update( + {"heater_id": self._heater_id, "cooling_present": self._cooling_present} + ) + + def _device_data_switching_group( + self, device: DeviceData, data: DeviceData + ) -> None: + """Helper-function for _get_device_data(). + + Determine switching group device data. + """ + if device["dev_class"] in SWITCH_GROUP_TYPES: + counter = 0 + for member in device["members"]: + if self.gw_devices[member]["switches"].get("relay"): + counter += 1 + data["switches"]["relay"] = counter != 0 + self._count += 1 + + def _device_data_adam(self, device: DeviceData, data: DeviceData) -> None: + """Helper-function for _get_device_data(). + + Determine Adam heating-status for on-off heating via valves, + available regulations_modes and thermostat control_states. + """ + if self.smile(ADAM): + # Indicate heating_state based on valves being open in case of city-provided heating + if ( + device["dev_class"] == "heater_central" + and self._on_off_device + and isinstance(self._heating_valves(), int) + ): + data["binary_sensors"]["heating_state"] = self._heating_valves() != 0 + + # Show the allowed regulation modes and gateway_modes + if device["dev_class"] == "gateway": + if self._reg_allowed_modes: + data["regulation_modes"] = self._reg_allowed_modes + self._count += 1 + if self._gw_allowed_modes: + data["gateway_modes"] = self._gw_allowed_modes + self._count += 1 + + # Control_state, only for Adam master thermostats + if device["dev_class"] in ZONE_THERMOSTATS: + loc_id = device["location"] + if ctrl_state := self._control_state(loc_id): + data["control_state"] = ctrl_state + self._count += 1 + + def _device_data_climate(self, device: DeviceData, data: DeviceData) -> None: + """Helper-function for _get_device_data(). + + Determine climate-control device data. + """ + loc_id = device["location"] + + # Presets + data["preset_modes"] = None + data["active_preset"] = None + self._count += 2 + if presets := self._presets(loc_id): + data["preset_modes"] = list(presets) + data["active_preset"] = self._preset(loc_id) + + # Schedule + avail_schedules, sel_schedule = self._schedules(loc_id) + data["available_schedules"] = avail_schedules + data["select_schedule"] = sel_schedule + self._count += 2 + + # Operation modes: auto, heat, heat_cool, cool and off + data["mode"] = "auto" + self._count += 1 + if sel_schedule == NONE: + data["mode"] = "heat" + if self._cooling_present: + data["mode"] = "cool" if self.check_reg_mode("cooling") else "heat_cool" + + if self.check_reg_mode("off"): + data["mode"] = "off" + + if NONE not in avail_schedules: + self._get_schedule_states_with_off( + loc_id, avail_schedules, sel_schedule, data + ) + + def check_reg_mode(self, mode: str) -> bool: + """Helper-function for device_data_climate().""" + gateway = self.gw_devices[self.gateway_id] + return ( + "regulation_modes" in gateway and gateway["select_regulation_mode"] == mode + ) + + def _get_schedule_states_with_off( + self, location: str, schedules: list[str], selected: str, data: DeviceData + ) -> None: + """Collect schedules with states for each thermostat. + + Also, replace NONE by OFF when none of the schedules are active. + """ + loc_schedule_states: dict[str, str] = {} + for schedule in schedules: + loc_schedule_states[schedule] = "off" + if schedule == selected and data["mode"] == "auto": + loc_schedule_states[schedule] = "on" + self._schedule_old_states[location] = loc_schedule_states + + all_off = True + for state in self._schedule_old_states[location].values(): + if state == "on": + all_off = False + if all_off: + data["select_schedule"] = OFF + + def _check_availability( + self, device: DeviceData, dev_class: str, data: DeviceData, message: str + ) -> None: + """Helper-function for _get_device_data(). + + Provide availability status for the wired-commected devices. + """ + if device["dev_class"] == dev_class: + data["available"] = True + self._count += 1 + for item in self._notifications.values(): + for msg in item.values(): + if message in msg: + data["available"] = False + + def _get_device_data(self, dev_id: str) -> DeviceData: + """Helper-function for _all_device_data() and async_update(). + + Provide device-data, based on Location ID (= dev_id), from APPLIANCES. + """ + device = self.gw_devices[dev_id] + data = self._get_measurement_data(dev_id) + + # Check availability of wired-connected devices + # Smartmeter + self._check_availability( + device, "smartmeter", data, "P1 does not seem to be connected" + ) + # OpenTherm device + if device["name"] != "OnOff": + self._check_availability( + device, "heater_central", data, "no OpenTherm communication" + ) + + # Switching groups data + self._device_data_switching_group(device, data) + # Adam data + self._device_data_adam(device, data) + # Skip obtaining data for non master-thermostats + if device["dev_class"] not in ZONE_THERMOSTATS: + return data + + # Thermostat data (presets, temperatures etc) + self._device_data_climate(device, data) + + return data From 0c6de498fccb014958001e2aa6f7f33bd68e70bb Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 20 Jan 2024 11:47:48 +0100 Subject: [PATCH 087/306] Add SmileLegacy class in smile_legacy.py --- plugwise/smile_legacy.py | 206 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) create mode 100644 plugwise/smile_legacy.py diff --git a/plugwise/smile_legacy.py b/plugwise/smile_legacy.py new file mode 100644 index 000000000..252e91cd7 --- /dev/null +++ b/plugwise/smile_legacy.py @@ -0,0 +1,206 @@ +"""Use of this source code is governed by the MIT license found in the LICENSE file. + +Plugwise backend module for Home Assistant Core - covering the legacy P1, Anna, and Stretch devices. +""" +from __future__ import annotations + +class SmileLegacy(SmileComm, SmileLegacyData): + """The Plugwise SmileLegacy class.""" + + # pylint: disable=too-many-instance-attributes, too-many-public-methods + + def __init__( + self, + host: str, + password: str, + username: str = DEFAULT_USERNAME, + port: int = DEFAULT_PORT, + timeout: float = DEFAULT_TIMEOUT, + websession: aiohttp.ClientSession | None = None, + ) -> None: + """Set the constructor for this class.""" + super().__init__( + host, + password, + username, + port, + timeout, + websession, + ) + SmileLegacyData.__init__(self) + self._previous_day_number: str = "0" + + async def _update_domain_objects(self) -> None: + """Helper-function for full_update_device() and async_update(). + + Request domain_objects data. + """ + self._domain_objects = await self._request(DOMAIN_OBJECTS) + + # If Plugwise notifications present: + self._notifications = {} + for notification in self._domain_objects.findall("./notification"): + try: + msg_id = notification.attrib["id"] + msg_type = notification.find("type").text + msg = notification.find("message").text + self._notifications.update({msg_id: {msg_type: msg}}) + LOGGER.debug("Plugwise notifications: %s", self._notifications) + except AttributeError: # pragma: no cover + LOGGER.debug( + "Plugwise notification present but unable to process, manually investigate: %s", + f"{self._endpoint}{DOMAIN_OBJECTS}", + ) + + async def _full_update_device(self) -> None: + """Perform a first fetch of all XML data, needed for initialization.""" + await self._update_domain_objects() + self._locations = await self._request(LOCATIONS) + self._modules = await self._request(MODULES) + # P1 legacy has no appliances + if not (self.smile_type == "power" and self._smile_legacy): + self._appliances = await self._request(APPLIANCES) + + async def async_update(self) -> PlugwiseData: + """Perform an incremental update for updating the various device states.""" + # Perform a full update at day-change + day_number = dt.datetime.now().strftime("%w") + if ( + day_number # pylint: disable=consider-using-assignment-expr + != self._previous_day_number + ): + LOGGER.debug( + "Performing daily full-update, reload the Plugwise integration when a single entity becomes unavailable." + ) + self.gw_data: GatewayData = {} + self.gw_devices: dict[str, DeviceData] = {} + await self._full_update_device() + self.get_all_devices() + # Otherwise perform an incremental update + else: + await self._update_domain_objects() + match self._target_smile: + case "smile_v2": + self._modules = await self._request(MODULES) + case self._target_smile if self._target_smile in REQUIRE_APPLIANCES: + self._appliances = await self._request(APPLIANCES) + + self._update_gw_devices() + self.gw_data["notifications"] = self._notifications + + self._previous_day_number = day_number + return PlugwiseData(self.gw_data, self.gw_devices) + + async def set_schedule_state(self, state: str) -> None: + """Activate/deactivate the Schedule. + + Determined from - DOMAIN_OBJECTS. + Used in HA Core to set the hvac_mode: in practice switch between schedule on - off. + """ + if state not in ["on", "off"]: + raise PlugwiseError("Plugwise: invalid schedule state.") + + name = "Thermostat schedule" + schedule_rule_id: str | None = None + for rule in self._domain_objects.findall("rule"): + if rule.find("name").text == name: + schedule_rule_id = rule.attrib["id"] + + if schedule_rule_id is None: + raise PlugwiseError("Plugwise: no schedule with this name available.") + + new_state = "false" + if state == "on": + new_state = "true" + + locator = f'.//*[@id="{schedule_rule_id}"]/template' + for rule in self._domain_objects.findall(locator): + template_id = rule.attrib["id"] + + uri = f"{RULES};id={schedule_rule_id}" + data = ( + "{new_state}' + ) + + await self._request(uri, method="put", data=data) + + async def set_preset(self, preset: str) -> None: + """Set the given Preset on the relevant Thermostat - from DOMAIN_OBJECTS.""" + if (presets := self._presets()) is None: + raise PlugwiseError("Plugwise: no presets available.") # pragma: no cover + if preset not in list(presets): + raise PlugwiseError("Plugwise: invalid preset.") + + locator = f'rule/directives/when/then[@icon="{preset}"].../.../...' + rule = self._domain_objects.find(locator) + data = f'true' + + await self._request(RULES, method="put", data=data) + + async def set_temperature(self, setpoint: str) -> None: + """Set the given Temperature on the relevant Thermostat.""" + if setpoint is None: + raise PlugwiseError( + "Plugwise: failed setting temperature: no valid input provided" + ) # pragma: no cover" + + temperature = str(setpoint) + uri = self._thermostat_uri() + data = ( + "" + f"{temperature}" + ) + + await self._request(uri, method="put", data=data) + + async def set_switch_state( + self, appl_id: str, members: list[str] | None, model: str, state: str + ) -> None: + """Set the given State of the relevant Switch.""" + switch = Munch() + switch.actuator = "actuators" + switch.func_type = "relay" + switch.func = "state" + + if members is not None: + return await self._set_groupswitch_member_state(members, state, switch) + + locator = f'appliance[@id="{appl_id}"]/{switch.actuator}/{switch.func_type}' + found: list[etree] = self._appliances.findall(locator) + for item in found: + if (sw_type := item.find("type")) is not None: + if sw_type.text == switch.act_type: + switch_id = item.attrib["id"] + else: + switch_id = item.attrib["id"] + break + + uri = f"{APPLIANCES};id={appl_id}/{switch.func_type}" + data = f"<{switch.func_type}><{switch.func}>{state}" + + if model == "relay": + locator = ( + f'appliance[@id="{appl_id}"]/{switch.actuator}/{switch.func_type}/lock' + ) + # Don't bother switching a relay when the corresponding lock-state is true + if self._appliances.find(locator).text == "true": + raise PlugwiseError("Plugwise: the locked Relay was not switched.") + + await self._request(uri, method="put", data=data) + + async def _set_groupswitch_member_state( + self, members: list[str], state: str, switch: Munch + ) -> None: + """Helper-function for set_switch_state(). + + Set the given State of the relevant Switch within a group of members. + """ + for member in members: + locator = f'appliance[@id="{member}"]/{switch.actuator}/{switch.func_type}' + switch_id = self._appliances.find(locator).attrib["id"] + uri = f"{APPLIANCES};id={member}/{switch.func_type}" + data = f"<{switch.func_type}><{switch.func}>{state}" + + await self._request(uri, method="put", data=data) From a62b8a1817221d5ecb3d3432b677c56871c140c4 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 20 Jan 2024 12:00:35 +0100 Subject: [PATCH 088/306] Updates, add SmileLegacyData class in data_legacy.py --- plugwise/data_legacy.py | 330 +++++++++++++++++++++++++++++++++++++++ plugwise/smile_legacy.py | 29 ++-- 2 files changed, 343 insertions(+), 16 deletions(-) create mode 100644 plugwise/data_legacy.py diff --git a/plugwise/data_legacy.py b/plugwise/data_legacy.py new file mode 100644 index 000000000..e080022d8 --- /dev/null +++ b/plugwise/data_legacy.py @@ -0,0 +1,330 @@ +"""Use of this source code is governed by the MIT license found in the LICENSE file. + +Plugwise Smile protocol data-collection helpers for legacy devices. +""" +from __future__ import annotations + +import datetime as dt + +import aiohttp +from defusedxml import ElementTree as etree + +# Dict as class +from munch import Munch + +# Version detection +import semver + +from .constants import ( + ADAM, + ANNA, + APPLIANCES, + DEFAULT_PORT, + DEFAULT_TIMEOUT, + DEFAULT_USERNAME, + DOMAIN_OBJECTS, + LOCATIONS, + LOGGER, + MAX_SETPOINT, + MIN_SETPOINT, + MODULES, + NONE, + NOTIFICATIONS, + OFF, + REQUIRE_APPLIANCES, + RULES, + SMILES, + STATUS, + SWITCH_GROUP_TYPES, + SYSTEM, + ZONE_THERMOSTATS, + ActuatorData, + DeviceData, + GatewayData, + PlugwiseData, +) +from .exceptions import ( + InvalidSetupError, + PlugwiseError, + ResponseError, + UnsupportedDeviceError, +) +from .helper import SmileComm, SmileHelper + + +def remove_empty_platform_dicts(data: DeviceData) -> None: + """Helper-function for removing any empty platform dicts.""" + if not data["binary_sensors"]: + data.pop("binary_sensors") + if not data["sensors"]: + data.pop("sensors") + if not data["switches"]: + data.pop("switches") + + +class SmileLegacyData(SmileHelper): + """The Plugwise Smile main class.""" + + def _update_gw_devices(self) -> None: + """Helper-function for _all_device_data() and async_update(). + + Collect data for each device and add to self.gw_devices. + """ + for device_id, device in self.gw_devices.items(): + data = self._get_device_data(device_id) + self._add_or_update_notifications(device_id, device, data) + device.update(data) + self._update_for_cooling(device) + remove_empty_platform_dicts(device) + + def _add_or_update_notifications( + self, device_id: str, device: DeviceData, data: DeviceData + ) -> None: + """Helper-function adding or updating the Plugwise notifications.""" + if ( + device_id == self.gateway_id + and ( + self._is_thermostat + or (self.smile_type == "power" and not self._smile_legacy) + ) + ) or ( + "binary_sensors" in device + and "plugwise_notification" in device["binary_sensors"] + ): + data["binary_sensors"]["plugwise_notification"] = bool(self._notifications) + self._count += 1 + + def _update_for_cooling(self, device: DeviceData) -> None: + """Helper-function for adding/updating various cooling-related values.""" + # For Anna and heating + cooling, replace setpoint with setpoint_high/_low + if ( + self.smile(ANNA) + and self._cooling_present + and device["dev_class"] == "thermostat" + ): + thermostat = device["thermostat"] + sensors = device["sensors"] + temp_dict: ActuatorData = { + "setpoint_low": thermostat["setpoint"], + "setpoint_high": MAX_SETPOINT, + } + if self._cooling_enabled: + temp_dict = { + "setpoint_low": MIN_SETPOINT, + "setpoint_high": thermostat["setpoint"], + } + thermostat.pop("setpoint") + temp_dict.update(thermostat) + device["thermostat"] = temp_dict + if "setpoint" in sensors: + sensors.pop("setpoint") + sensors["setpoint_low"] = temp_dict["setpoint_low"] + sensors["setpoint_high"] = temp_dict["setpoint_high"] + self._count += 2 + + def get_all_devices(self) -> None: + """Determine the evices present from the obtained XML-data. + + Run this functions once to gather the initial device configuration, + then regularly run async_update() to refresh the device data. + """ + # Gather all the devices and their initial data + self._all_appliances() + if self._is_thermostat: + self._scan_thermostats() + # Collect a list of thermostats with offset-capability + self.therms_with_offset_func = ( + self._get_appliances_with_offset_functionality() + ) + + # Collect and add switching- and/or pump-group devices + if group_data := self._get_group_switches(): + self.gw_devices.update(group_data) + + # Collect the remaining data for all devices + self._all_device_data() + + def _all_device_data(self) -> None: + """Helper-function for get_all_devices(). + + Collect data for each device and add to self.gw_data and self.gw_devices. + """ + self._update_gw_devices() + self.device_items = self._count + self.device_list = [] + for device in self.gw_devices: + self.device_list.append(device) + + self.gw_data.update( + { + "gateway_id": self.gateway_id, + "item_count": self._count, + "notifications": self._notifications, + "smile_name": self.smile_name, + } + ) + if self._is_thermostat: + self.gw_data.update( + {"heater_id": self._heater_id, "cooling_present": self._cooling_present} + ) + + def _device_data_switching_group( + self, device: DeviceData, data: DeviceData + ) -> None: + """Helper-function for _get_device_data(). + + Determine switching group device data. + """ + if device["dev_class"] in SWITCH_GROUP_TYPES: + counter = 0 + for member in device["members"]: + if self.gw_devices[member]["switches"].get("relay"): + counter += 1 + data["switches"]["relay"] = counter != 0 + self._count += 1 + + def _device_data_adam(self, device: DeviceData, data: DeviceData) -> None: + """Helper-function for _get_device_data(). + + Determine Adam heating-status for on-off heating via valves, + available regulations_modes and thermostat control_states. + """ + if self.smile(ADAM): + # Indicate heating_state based on valves being open in case of city-provided heating + if ( + device["dev_class"] == "heater_central" + and self._on_off_device + and isinstance(self._heating_valves(), int) + ): + data["binary_sensors"]["heating_state"] = self._heating_valves() != 0 + + # Show the allowed regulation modes and gateway_modes + if device["dev_class"] == "gateway": + if self._reg_allowed_modes: + data["regulation_modes"] = self._reg_allowed_modes + self._count += 1 + if self._gw_allowed_modes: + data["gateway_modes"] = self._gw_allowed_modes + self._count += 1 + + # Control_state, only for Adam master thermostats + if device["dev_class"] in ZONE_THERMOSTATS: + loc_id = device["location"] + if ctrl_state := self._control_state(loc_id): + data["control_state"] = ctrl_state + self._count += 1 + + def _device_data_climate(self, device: DeviceData, data: DeviceData) -> None: + """Helper-function for _get_device_data(). + + Determine climate-control device data. + """ + loc_id = device["location"] + + # Presets + data["preset_modes"] = None + data["active_preset"] = None + self._count += 2 + if presets := self._presets(loc_id): + data["preset_modes"] = list(presets) + data["active_preset"] = self._preset(loc_id) + + # Schedule + avail_schedules, sel_schedule = self._schedules(loc_id) + data["available_schedules"] = avail_schedules + data["select_schedule"] = sel_schedule + self._count += 2 + + # Operation modes: auto, heat, heat_cool, cool and off + data["mode"] = "auto" + self._count += 1 + if sel_schedule == NONE: + data["mode"] = "heat" + if self._cooling_present: + data["mode"] = "cool" if self.check_reg_mode("cooling") else "heat_cool" + + if self.check_reg_mode("off"): + data["mode"] = "off" + + if NONE not in avail_schedules: + self._get_schedule_states_with_off( + loc_id, avail_schedules, sel_schedule, data + ) + + def check_reg_mode(self, mode: str) -> bool: + """Helper-function for device_data_climate().""" + gateway = self.gw_devices[self.gateway_id] + return ( + "regulation_modes" in gateway and gateway["select_regulation_mode"] == mode + ) + + def _get_schedule_states_with_off( + self, location: str, schedules: list[str], selected: str, data: DeviceData + ) -> None: + """Collect schedules with states for each thermostat. + + Also, replace NONE by OFF when none of the schedules are active, + only for non-legacy thermostats. + """ + loc_schedule_states: dict[str, str] = {} + for schedule in schedules: + loc_schedule_states[schedule] = "off" + if schedule == selected and data["mode"] == "auto": + loc_schedule_states[schedule] = "on" + self._schedule_old_states[location] = loc_schedule_states + + all_off = True + if not self._smile_legacy: + for state in self._schedule_old_states[location].values(): + if state == "on": + all_off = False + if all_off: + data["select_schedule"] = OFF + + def _check_availability( + self, device: DeviceData, dev_class: str, data: DeviceData, message: str + ) -> None: + """Helper-function for _get_device_data(). + + Provide availability status for the wired-commected devices. + """ + if device["dev_class"] == dev_class: + data["available"] = True + self._count += 1 + for item in self._notifications.values(): + for msg in item.values(): + if message in msg: + data["available"] = False + + def _get_device_data(self, dev_id: str) -> DeviceData: + """Helper-function for _all_device_data() and async_update(). + + Provide device-data, based on Location ID (= dev_id), from APPLIANCES. + """ + device = self.gw_devices[dev_id] + data = self._get_measurement_data(dev_id) + + # Check availability of non-legacy wired-connected devices + if not self._smile_legacy: + # Smartmeter + self._check_availability( + device, "smartmeter", data, "P1 does not seem to be connected" + ) + # OpenTherm device + if device["name"] != "OnOff": + self._check_availability( + device, "heater_central", data, "no OpenTherm communication" + ) + + # Switching groups data + self._device_data_switching_group(device, data) + # Adam data + self._device_data_adam(device, data) + # Skip obtaining data for non master-thermostats + if device["dev_class"] not in ZONE_THERMOSTATS: + return data + + # Thermostat data (presets, temperatures etc) + self._device_data_climate(device, data) + + return data \ No newline at end of file diff --git a/plugwise/smile_legacy.py b/plugwise/smile_legacy.py index 252e91cd7..c9ae38c53 100644 --- a/plugwise/smile_legacy.py +++ b/plugwise/smile_legacy.py @@ -30,14 +30,19 @@ def __init__( SmileLegacyData.__init__(self) self._previous_day_number: str = "0" - async def _update_domain_objects(self) -> None: - """Helper-function for full_update_device() and async_update(). - - Request domain_objects data. - """ + async def _full_update_device(self) -> None: + """Perform a first fetch of all XML data, needed for initialization.""" self._domain_objects = await self._request(DOMAIN_OBJECTS) + self._locations = await self._request(LOCATIONS) + self._modules = await self._request(MODULES) + # P1 legacy has no appliances + if not (self.smile_type == "power" and self._smile_legacy): + self._appliances = await self._request(APPLIANCES) - # If Plugwise notifications present: + self._get_plugwise_notifications() + + def _get_plugwise_notifications(self) -> None: + """Collect the Plugwise notifications.""" self._notifications = {} for notification in self._domain_objects.findall("./notification"): try: @@ -52,15 +57,6 @@ async def _update_domain_objects(self) -> None: f"{self._endpoint}{DOMAIN_OBJECTS}", ) - async def _full_update_device(self) -> None: - """Perform a first fetch of all XML data, needed for initialization.""" - await self._update_domain_objects() - self._locations = await self._request(LOCATIONS) - self._modules = await self._request(MODULES) - # P1 legacy has no appliances - if not (self.smile_type == "power" and self._smile_legacy): - self._appliances = await self._request(APPLIANCES) - async def async_update(self) -> PlugwiseData: """Perform an incremental update for updating the various device states.""" # Perform a full update at day-change @@ -78,7 +74,7 @@ async def async_update(self) -> PlugwiseData: self.get_all_devices() # Otherwise perform an incremental update else: - await self._update_domain_objects() + self._domain_objects = await self._request(DOMAIN_OBJECTS) match self._target_smile: case "smile_v2": self._modules = await self._request(MODULES) @@ -86,6 +82,7 @@ async def async_update(self) -> PlugwiseData: self._appliances = await self._request(APPLIANCES) self._update_gw_devices() + self._get_plugwise_notifications() self.gw_data["notifications"] = self._notifications self._previous_day_number = day_number From 024c4b48063117bef731f39df9af776ef2147070 Mon Sep 17 00:00:00 2001 From: Bouwe Date: Sat, 20 Jan 2024 12:04:40 +0100 Subject: [PATCH 089/306] Move all specific API-functions for actual devices to smile_actual.py --- plugwise/smile_actual.py | 415 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 415 insertions(+) create mode 100644 plugwise/smile_actual.py diff --git a/plugwise/smile_actual.py b/plugwise/smile_actual.py new file mode 100644 index 000000000..a6a87d3aa --- /dev/null +++ b/plugwise/smile_actual.py @@ -0,0 +1,415 @@ +"""Use of this source code is governed by the MIT license found in the LICENSE file. + +Plugwise backend module for Home Assistant Core. +""" +from __future__ import annotations + +import datetime as dt + +import aiohttp +from defusedxml import ElementTree as etree + +# Dict as class +from munch import Munch + +# Version detection +import semver + +from .constants import ( + ADAM, + ANNA, + APPLIANCES, + DEFAULT_PORT, + DEFAULT_TIMEOUT, + DEFAULT_USERNAME, + DOMAIN_OBJECTS, + LOCATIONS, + LOGGER, + MAX_SETPOINT, + MIN_SETPOINT, + NOTIFICATIONS, + OFF, + RULES, + SMILES, + STATUS, + SYSTEM, + DeviceData, + GatewayData, + PlugwiseData, +) +from .data import SmileData +from .exceptions import ( + InvalidSetupError, + PlugwiseError, + ResponseError, + UnsupportedDeviceError, +) +from .data import SmileData +from .helper import SmileComm + + +class SmileActual(SmileComm, SmileData): + """The Plugwise SmileActual helper class.""" + + # pylint: disable=too-many-instance-attributes, too-many-public-methods + + def __init__( + self, + host: str, + password: str, + username: str = DEFAULT_USERNAME, + port: int = DEFAULT_PORT, + timeout: float = DEFAULT_TIMEOUT, + websession: aiohttp.ClientSession | None = None, + ) -> None: + """Set the constructor for this class.""" + super().__init__( + host, + password, + username, + port, + timeout, + websession, + ) + SmileData.__init__(self) + + self.smile_hostname: str | None = None + self._previous_day_number: str = "0" + self._target_smile: str | None = None + + async def _full_update_device(self) -> None: + """Perform a first fetch of all XML data, needed for initialization.""" + self._domain_objects = await self._request(DOMAIN_OBJECTS) + self._get_plugwise_notifications() + + def _get_plugwise_notifications(self) -> None: + """Collect the Plugwise notifications.""" + self._notifications = {} + for notification in self._domain_objects.findall("./notification"): + try: + msg_id = notification.attrib["id"] + msg_type = notification.find("type").text + msg = notification.find("message").text + self._notifications.update({msg_id: {msg_type: msg}}) + LOGGER.debug("Plugwise notifications: %s", self._notifications) + except AttributeError: # pragma: no cover + LOGGER.debug( + "Plugwise notification present but unable to process, manually investigate: %s", + f"{self._endpoint}{DOMAIN_OBJECTS}", + ) + + def get_all_devices(self) -> None: + """Determine the evices present from the obtained XML-data. + + Run this functions once to gather the initial device configuration, + then regularly run async_update() to refresh the device data. + """ + # Gather all the devices and their initial data + self._all_appliances() + if self._is_thermostat: + if self.smile(ADAM): + self._scan_thermostats() + # Collect a list of thermostats with offset-capability + self.therms_with_offset_func = ( + self._get_appliances_with_offset_functionality() + ) + + # Collect and add switching- and/or pump-group devices + if group_data := self._get_group_switches(): + self.gw_devices.update(group_data) + + # Collect the remaining data for all devices + self._all_device_data() + + async def async_update(self) -> PlugwiseData: + """Perform an incremental update for updating the various device states.""" + # Perform a full update at day-change + self.gw_data: GatewayData = {} + self.gw_devices: dict[str, DeviceData] = {} + await self._full_update_device() + self.get_all_devices() + + return PlugwiseData(self.gw_data, self.gw_devices) + +######################################################################################################## +### API Set and HA Service-related Functions ### +######################################################################################################## + + async def set_schedule_state( + self, + loc_id: str, + new_state: str, + name: str | None = None, + ) -> None: + """Activate/deactivate the Schedule, with the given name, on the relevant Thermostat. + + Determined from - DOMAIN_OBJECTS. + Used in HA Core to set the hvac_mode: in practice switch between schedule on - off. + """ + # Input checking + if new_state not in ["on", "off"]: + raise PlugwiseError("Plugwise: invalid schedule state.") + + # Translate selection of Off-schedule-option to disabling the active schedule + if name == OFF: + new_state = "off" + + # Handle no schedule-name / Off-schedule provided + if name is None or name == OFF: + if schedule_name := self._last_active[loc_id]: + name = schedule_name + else: + return + + assert isinstance(name, str) + schedule_rule = self._rule_ids_by_name(name, loc_id) + # Raise an error when the schedule name does not exist + if not schedule_rule or schedule_rule is None: + raise PlugwiseError("Plugwise: no schedule with this name available.") + + # If no state change is requested, do nothing + if new_state == self._schedule_old_states[loc_id][name]: + return + + schedule_rule_id: str = next(iter(schedule_rule)) + template = ( + '