diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f0031e6c..1334b4c3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ # Changelog -## Ongoing +## v1.11.1 -- Code optimizations via PR [#837](https://github.com/plugwise/python-plugwise/pull/837), [#838](https://github.com/plugwise/python-plugwise/pull/838), [#839](https://github.com/plugwise/python-plugwise/pull/839), [#840](https://github.com/plugwise/python-plugwise/pull/840) +- Code optimizations via PR [#837](https://github.com/plugwise/python-plugwise/pull/837), [#838](https://github.com/plugwise/python-plugwise/pull/838), [#839](https://github.com/plugwise/python-plugwise/pull/839), [#840](https://github.com/plugwise/python-plugwise/pull/840), and [#841](https://github.com/plugwise/python-plugwise/pull/841) ## v1.11.0 diff --git a/plugwise/helper.py b/plugwise/helper.py index 2bd16bf42..88d80e8b6 100644 --- a/plugwise/helper.py +++ b/plugwise/helper.py @@ -272,8 +272,9 @@ def _appliance_info_finder(self, appl: Munch, appliance: etree.Element) -> Munch def _appl_gateway_info(self, appl: Munch, appliance: etree.Element) -> Munch: """Helper-function for _appliance_info_finder().""" - self._gateway_id = appliance.get("id") - appl.firmware = str(self.smile.version) + self._gateway_id = appl.entity_id + locator = "./gateway/firmware_version" + appl.firmware = self._domain_objects.find(locator).text appl.hardware = self.smile.hw_version appl.mac = self.smile.mac_address appl.model = self.smile.model diff --git a/pyproject.toml b/pyproject.toml index e3df36e18..5fadb3e00 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "plugwise" -version = "1.11.0" +version = "1.11.1" license = "MIT" description = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3." readme = "README.md" 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 24ff7e482..c25d3f02c 100644 --- a/userdata/updated/adam_plus_anna_new/core.domain_objects.xml +++ b/userdata/updated/adam_plus_anna_new/core.domain_objects.xml @@ -1,9 +1,79 @@ + + Aanvoer water afsluiter (nous lz3) + A device that communicates through the ZigBee protocol. + valve_actuator + 2024-11-11T20:31:49.734+01:00 + 2024-11-15T13:55:19.574+01:00 + + + + + + + + relay + + 2024-11-15T13:55:19.571+01:00 + 2024-11-15T13:55:19.571+01:00 + + + + off + + + + + + 2024-11-15T13:55:19.571+01:00 + false + off + + + + + + _TZ3000_abjodzas + TS0011 + + + + 2024-11-11T20:31:46.189+01:00 + 2024-11-11T20:31:49.706+01:00 + + + + + + + + + + + + A4C13862AF9917B1 + end_device + true + battery + + + + 221 + 1 + parent + + + 2024-11-15T14:07:23+01:00 + true + + + SmartPlug Floor 0 A device that communicates through the ZigBee protocol. - zz_misc + + heater_central 2022-03-11T11:21:58.858+01:00 2022-06-13T15:15:12.921+02:00 2023-12-22T16:18:09.841+01:00 @@ -97,12 +167,98 @@ + + Badkamer + +