From 6b4d0f2f5be9c460c4e614d65e3fd4c5b75e882e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 26 Jun 2025 23:12:03 +0000
Subject: [PATCH 01/32] chore(deps): update pre-commit hook
 astral-sh/ruff-pre-commit to v0.12.1

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9ff73a7b5..f1175d808 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,7 +5,7 @@ default_language_version:
 repos:
   # Run manually in CI skipping the branch checks
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.0
+    rev: v0.12.1
     hooks:
       - id: ruff
         name: "Ruff check"

From 681bbae8c79cef719951efa7c0307b9549794b76 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Thu, 26 Jun 2025 19:34:54 +0200
Subject: [PATCH 02/32] Implement async aiofiles.open()

---
 pyproject.toml               |  1 +
 tests/test_adam.py           | 20 ++++++++++----------
 tests/test_anna.py           | 34 +++++++++++++++++-----------------
 tests/test_init.py           | 36 +++++++++++++++++++-----------------
 tests/test_legacy_anna.py    |  4 ++--
 tests/test_legacy_p1.py      |  6 +++---
 tests/test_legacy_stretch.py |  8 ++++----
 tests/test_p1.py             |  6 +++---
 8 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index ede4e456a..ef4299677 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -25,6 +25,7 @@ maintainers = [
 ]
 requires-python = ">=3.13"
 dependencies    = [
+        "aiofiles",
         "aiohttp",
         "defusedxml",
         "munch",
diff --git a/tests/test_adam.py b/tests/test_adam.py
index 96b015ce5..1ef41c0de 100644
--- a/tests/test_adam.py
+++ b/tests/test_adam.py
@@ -21,7 +21,7 @@ async def test_connect_adam_plus_anna_new(self):
         """Test extended Adam (firmware 3.7) with Anna and a switch-group setup."""
         self.smile_setup = "adam_plus_anna_new"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -139,7 +139,7 @@ async def test_connect_adam_plus_anna_new(self):
 
         # Now change some data and change directory reading xml from
         # emulating reading newer dataset after an update_interval
-        testdata_updated = self.load_testdata(
+        testdata_updated = await self.load_testdata(
             SMILE_TYPE, f"{self.smile_setup}_UPDATED_DATA"
         )
         self.smile_setup = "updated/adam_plus_anna_new"
@@ -167,7 +167,7 @@ async def test_connect_adam_plus_anna_new(self):
         await self.disconnect(server, client)
 
         self.smile_setup = "adam_plus_anna_new"
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper(raise_timeout=True)
         await self.device_test(
             smile, "2023-12-17 00:00:01", testdata, skip_testing=True
@@ -190,7 +190,7 @@ async def test_connect_adam_plus_anna_new_regulation_off(self):
         """Test regultaion_mode off with control_state key missing for Adam."""
         self.smile_setup = "adam_plus_anna_new_regulation_off"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -204,7 +204,7 @@ async def test_connect_adam_zone_per_device(self):
         """Test an extensive setup of Adam with a zone per device."""
         self.smile_setup = "adam_zone_per_device"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -285,7 +285,7 @@ async def test_connect_adam_multiple_devices_per_zone(self):
         """Test an extensive setup of Adam with multiple devices per zone."""
         self.smile_setup = "adam_multiple_devices_per_zone"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -333,7 +333,7 @@ async def test_adam_heatpump_cooling(self):
         """Test Adam with heatpump in cooling mode and idle."""
         self.smile_setup = "adam_heatpump_cooling"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
 
         await self.device_test(smile, "2022-01-02 00:00:01", testdata)
@@ -359,7 +359,7 @@ async def test_connect_adam_onoff_cooling_fake_firmware(self):
         """Test an Adam with a fake OnOff cooling device in cooling mode."""
         self.smile_setup = "adam_onoff_cooling_fake_firmware"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -382,7 +382,7 @@ async def test_connect_adam_plus_anna(self):
         """Test Adam (firmware 3.0) with Anna setup."""
         self.smile_setup = "adam_plus_anna"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -432,7 +432,7 @@ async def test_adam_plus_jip(self):
         """Test Adam with Jip setup."""
         self.smile_setup = "adam_jip"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
 
         await self.device_test(smile, "2021-06-20 00:00:01", testdata)
diff --git a/tests/test_anna.py b/tests/test_anna.py
index bce21b1ab..92efae3d9 100644
--- a/tests/test_anna.py
+++ b/tests/test_anna.py
@@ -17,7 +17,7 @@ async def test_connect_anna_v4(self):
         """Test an Anna firmware 4 setup."""
         self.smile_setup = "anna_v4"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -55,7 +55,7 @@ async def test_connect_anna_v4(self):
 
         # Now change some data and change directory reading xml from
         # emulating reading newer dataset after an update_interval
-        testdata_updated = self.load_testdata(
+        testdata_updated = await self.load_testdata(
             SMILE_TYPE, f"{self.smile_setup}_UPDATED_DATA"
         )
 
@@ -97,7 +97,7 @@ async def test_connect_anna_v4_dhw(self):
         """Test an Anna firmware 4 setup for domestic hot water."""
         self.smile_setup = "anna_v4_dhw"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -127,7 +127,7 @@ async def test_connect_anna_v4_no_tag(self):
         """Test an Anna firmware 4 setup - missing tag (issue)."""
         self.smile_setup = "anna_v4_no_tag"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -155,7 +155,7 @@ async def test_connect_anna_without_boiler_fw441(self):
         """Test an Anna with firmware 4.4, without a boiler."""
         self.smile_setup = "anna_without_boiler_fw441"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -183,7 +183,7 @@ async def test_connect_anna_heatpump_heating(self):
 
         self.smile_setup = "anna_heatpump_heating"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -218,7 +218,7 @@ async def test_connect_anna_heatpump_heating(self):
         # Now change some data and change directory reading xml from
         # emulating reading newer dataset after an update_interval,
         # set testday to Monday to force an incremental update
-        testdata_updated = self.load_testdata(
+        testdata_updated = await self.load_testdata(
             SMILE_TYPE, f"{self.smile_setup}_UPDATED_DATA"
         )
 
@@ -240,7 +240,7 @@ async def test_connect_anna_heatpump_cooling(self):
         """
         self.smile_setup = "anna_heatpump_cooling"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -287,7 +287,7 @@ async def test_connect_anna_heatpump_cooling_fake_firmware(self):
         """
         self.smile_setup = "anna_heatpump_cooling_fake_firmware"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -312,7 +312,7 @@ async def test_connect_anna_elga_no_cooling(self):
 
         self.smile_setup = "anna_elga_no_cooling"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -337,7 +337,7 @@ async def test_connect_anna_elga_2(self):
         """Test a 2nd Anna with Elga setup, cooling off, in idle mode (with missing outdoor temperature - solved)."""
         self.smile_setup = "anna_elga_2"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -366,7 +366,7 @@ async def test_connect_anna_elga_2_schedule_off(self):
         """Test Anna with Elga setup, cooling off, in idle mode, modified to schedule off."""
         self.smile_setup = "anna_elga_2_schedule_off"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -391,7 +391,7 @@ async def test_connect_anna_elga_2_cooling(self):
         """
         self.smile_setup = "anna_elga_2_cooling"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -421,7 +421,7 @@ async def test_connect_anna_elga_2_cooling(self):
         assert result
 
         # Simulate a change of season: from cooling to heating after an update_interval
-        testdata_updated = self.load_testdata(
+        testdata_updated = await self.load_testdata(
             SMILE_TYPE, f"{self.smile_setup}_UPDATED_DATA"
         )
 
@@ -448,7 +448,7 @@ async def test_connect_anna_loria_heating_idle(self):
         """Test an Anna with a Loria in heating mode - state idle."""
         self.smile_setup = "anna_loria_heating_idle"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -516,7 +516,7 @@ async def test_connect_anna_loria_cooling_active(self):
         """Test an Anna with a Loria in heating mode - state idle."""
         self.smile_setup = "anna_loria_cooling_active"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -540,7 +540,7 @@ async def test_connect_anna_loria_driessens(self):
         """Test an Anna with a Loria in heating mode - state idle."""
         self.smile_setup = "anna_loria_driessens"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
diff --git a/tests/test_init.py b/tests/test_init.py
index c80468ec6..ed6be9ece 100644
--- a/tests/test_init.py
+++ b/tests/test_init.py
@@ -16,6 +16,7 @@
 import pytest
 
 # Testing
+import aiofiles
 import aiohttp
 from freezegun import freeze_time
 from packaging import version
@@ -50,7 +51,7 @@
 class TestPlugwise:  # pylint: disable=attribute-defined-outside-init
     """Tests for Plugwise Smile."""
 
-    def _write_json(self, call, data):
+    async def _write_json(self, call, data):
         """Store JSON data to per-setup files for HA component testing."""
         no_fixtures = os.getenv("NO_FIXTURES") == "1"
         if no_fixtures:
@@ -65,8 +66,8 @@ def _write_json(self, call, data):
         if not os.path.exists(os.path.dirname(datafile)):  # pragma: no cover
             os.mkdir(os.path.dirname(datafile))
 
-        with open(datafile, "w", encoding="utf-8") as fixture_file:
-            fixture_file.write(
+        async with aiofiles.open(datafile, "w", encoding="utf-8") as fixture_file:
+            await fixture_file.write(
                 json.dumps(
                     data,
                     indent=2,
@@ -77,15 +78,16 @@ def _write_json(self, call, data):
                 + "\n"
             )
 
-    def load_testdata(
+    async def load_testdata(
         self, smile_type: str = "adam", smile_setup: str = "adam_zone_per_device"
     ):
         """Load JSON data from setup, return as object."""
         path = os.path.join(
             os.path.dirname(__file__), f"../tests/data/{smile_type}/{smile_setup}.json"
         )
-        with open(path, encoding="utf-8") as testdata_file:
-            return json.load(testdata_file)
+        async with aiofiles.open(path, encoding="utf-8") as testdata_file:
+            content = await testdata_file.read()
+            return json.loads(content)
 
     async def setup_app(
         self,
@@ -187,8 +189,8 @@ async def smile_appliances(self, request):
             os.path.dirname(__file__),
             f"../userdata/{self.smile_setup}/core.appliances.xml",
         )
-        with open(userdata, encoding="utf-8") as filedata:
-            data = filedata.read()
+        async with aiofiles.open(userdata, encoding="utf-8") as filedata:
+            data = await filedata.read()
         return aiohttp.web.Response(text=data)
 
     async def smile_domain_objects(self, request):
@@ -197,8 +199,8 @@ async def smile_domain_objects(self, request):
             os.path.dirname(__file__),
             f"../userdata/{self.smile_setup}/core.domain_objects.xml",
         )
-        with open(userdata, encoding="utf-8") as filedata:
-            data = filedata.read()
+        async with aiofiles.open(userdata, encoding="utf-8") as filedata:
+            data = await filedata.read()
         return aiohttp.web.Response(text=data)
 
     async def smile_locations(self, request):
@@ -207,8 +209,8 @@ async def smile_locations(self, request):
             os.path.dirname(__file__),
             f"../userdata/{self.smile_setup}/core.locations.xml",
         )
-        with open(userdata, encoding="utf-8") as filedata:
-            data = filedata.read()
+        async with aiofiles.open(userdata, encoding="utf-8") as filedata:
+            data = await filedata.read()
         return aiohttp.web.Response(text=data)
 
     async def smile_modules(self, request):
@@ -217,8 +219,8 @@ async def smile_modules(self, request):
             os.path.dirname(__file__),
             f"../userdata/{self.smile_setup}/core.modules.xml",
         )
-        with open(userdata, encoding="utf-8") as filedata:
-            data = filedata.read()
+        async with aiofiles.open(userdata, encoding="utf-8") as filedata:
+            data = await filedata.read()
         return aiohttp.web.Response(text=data)
 
     async def smile_status(self, request):
@@ -228,8 +230,8 @@ async def smile_status(self, request):
                 os.path.dirname(__file__),
                 f"../userdata/{self.smile_setup}/system_status_xml.xml",
             )
-            with open(userdata, encoding="utf-8") as filedata:
-                data = filedata.read()
+            async with aiofiles.open(userdata, encoding="utf-8") as filedata:
+                data = await filedata.read()
             return aiohttp.web.Response(text=data)
         except OSError as exc:
             raise aiohttp.web.HTTPNotFound from exc
@@ -641,7 +643,7 @@ def test_and_assert(test_dict, data, header):
                         "cooling_state"
                     ]
 
-        self._write_json("data", data)
+        await self._write_json("data", data)
 
         if "FIXTURES" in os.environ:
             _LOGGER.info("Skipping tests: Requested fixtures only")  # pragma: no cover
diff --git a/tests/test_legacy_anna.py b/tests/test_legacy_anna.py
index a3a7b8469..1a2e7e20f 100644
--- a/tests/test_legacy_anna.py
+++ b/tests/test_legacy_anna.py
@@ -16,7 +16,7 @@ class TestPlugwiseAnna(TestPlugwise):  # pylint: disable=attribute-defined-outsi
     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)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
 
         server, smile, client = await self.connect_legacy_wrapper()
         assert smile.smile_hostname == "smile000000"
@@ -53,7 +53,7 @@ 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)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_legacy_wrapper()
         assert smile.smile_hostname == "smile000000"
 
diff --git a/tests/test_legacy_p1.py b/tests/test_legacy_p1.py
index d569ca52b..52f1d8504 100644
--- a/tests/test_legacy_p1.py
+++ b/tests/test_legacy_p1.py
@@ -15,7 +15,7 @@ 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)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_legacy_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -39,7 +39,7 @@ 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)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_legacy_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -56,7 +56,7 @@ async def test_connect_smile_p1_v2_2(self):
 
         # Now change some data and change directory reading xml from
         # emulating reading newer dataset after an update_interval
-        testdata_updated = self.load_testdata(
+        testdata_updated = await self.load_testdata(
             SMILE_TYPE, f"{self.smile_setup}_UPDATED_DATA"
         )
         self.smile_setup = "updated/smile_p1_v2_2"
diff --git a/tests/test_legacy_stretch.py b/tests/test_legacy_stretch.py
index 021cc385b..13d079020 100644
--- a/tests/test_legacy_stretch.py
+++ b/tests/test_legacy_stretch.py
@@ -15,7 +15,7 @@ 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)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_legacy_wrapper(stretch=True)
         assert smile.smile_hostname == "stretch000000"
 
@@ -39,7 +39,7 @@ async def test_connect_stretch_v31(self):
 
         # Now change some data and change directory reading xml from
         # emulating reading newer dataset after an update_interval
-        testdata_updated = self.load_testdata(
+        testdata_updated = await self.load_testdata(
             SMILE_TYPE, f"{self.smile_setup}_UPDATED_DATA"
         )
         self.smile_setup = "updated/stretch_v31"
@@ -55,7 +55,7 @@ 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)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_legacy_wrapper(stretch=True)
         assert smile.smile_hostname == "stretch000000"
 
@@ -94,7 +94,7 @@ async def test_connect_stretch_v27_no_domain(self):
         # 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)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_legacy_wrapper(stretch=True)
         assert smile.smile_hostname == "stretch000000"
 
diff --git a/tests/test_p1.py b/tests/test_p1.py
index 562ebc4fd..e379573e6 100644
--- a/tests/test_p1.py
+++ b/tests/test_p1.py
@@ -15,7 +15,7 @@ async def test_connect_p1v4_442_single(self):
         """Test a P1 firmware 4.4 single-phase setup."""
         self.smile_setup = "p1v4_442_single"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 
@@ -33,7 +33,7 @@ async def test_connect_p1v4_442_single(self):
 
         # Now change some data and change directory reading xml from
         # emulating reading newer dataset after an update_interval
-        testdata_updated = self.load_testdata(
+        testdata_updated = await self.load_testdata(
             SMILE_TYPE, f"{self.smile_setup}_UPDATED_DATA"
         )
         self.smile_setup = "updated/p1v4_442_single"
@@ -65,7 +65,7 @@ async def test_connect_p1v4_442_triple(self):
         """Test a P1 firmware 4 3-phase setup."""
         self.smile_setup = "p1v4_442_triple"
 
-        testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
         assert smile.smile_hostname == "smile000000"
 

From b9d2eb6d5eb0d746e27864bb566c313efab63738 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Fri, 27 Jun 2025 20:00:03 +0200
Subject: [PATCH 03/32] Update CHANGELOG

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d47c3971..c5df40835 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Ongoing
+
+- Implement async file-open in tests
+
 ## v1.7.6
 
 - Maintenance chores (mostly reworking Github CI Actions) backporting from efforts on Python Plugwise [USB: #264](https://github.com/plugwise/python-plugwise-usb/pull/264) after porting our progress using [USB: #263](https://github.com/plugwise/python-plugwise-usb/pull/263)

From 66eb458dfe0bd2c12a64abd9d94bfd88590343f0 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Fri, 27 Jun 2025 20:13:35 +0200
Subject: [PATCH 04/32] Remove unneeded async function designation

---
 tests/test_init.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/test_init.py b/tests/test_init.py
index ed6be9ece..8c67da028 100644
--- a/tests/test_init.py
+++ b/tests/test_init.py
@@ -89,7 +89,7 @@ async def load_testdata(
             content = await testdata_file.read()
             return json.loads(content)
 
-    async def setup_app(
+    def setup_app(
         self,
         broken=False,
         timeout=False,
@@ -132,7 +132,7 @@ async def setup_app(
 
         return app
 
-    async def setup_legacy_app(
+    def setup_legacy_app(
         self,
         broken=False,
         timeout=False,
@@ -290,7 +290,7 @@ async def connect(
         )
 
         # Happy flow
-        app = await self.setup_app(broken, timeout, raise_timeout, fail_auth, stretch)
+        app = self.setup_app(broken, timeout, raise_timeout, fail_auth, stretch)
 
         server = aiohttp.test_utils.TestServer(
             app, port=port, scheme="http", host="127.0.0.1"
@@ -374,7 +374,7 @@ async def connect_legacy(
         )
 
         # Happy flow
-        app = await self.setup_legacy_app(
+        app = self.setup_legacy_app(
             broken, timeout, raise_timeout, fail_auth, stretch
         )
 

From 4a2f7509e60810cc77b7f4a54b34e7cbb74418bd Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Fri, 27 Jun 2025 20:14:50 +0200
Subject: [PATCH 05/32] Ruff fix

---
 tests/test_init.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/test_init.py b/tests/test_init.py
index 8c67da028..d2384add6 100644
--- a/tests/test_init.py
+++ b/tests/test_init.py
@@ -374,9 +374,7 @@ async def connect_legacy(
         )
 
         # Happy flow
-        app = self.setup_legacy_app(
-            broken, timeout, raise_timeout, fail_auth, stretch
-        )
+        app = self.setup_legacy_app(broken, timeout, raise_timeout, fail_auth, stretch)
 
         server = aiohttp.test_utils.TestServer(
             app, port=port, scheme="http", host="127.0.0.1"

From e99725bd693afaa05e4cdc7b1b4877ed6e202ea8 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Fri, 27 Jun 2025 20:16:29 +0200
Subject: [PATCH 06/32] Remove unneeded list(dict()) constructs

---
 plugwise/data.py   | 2 +-
 plugwise/helper.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugwise/data.py b/plugwise/data.py
index 97ec5b51a..45cbe38db 100644
--- a/plugwise/data.py
+++ b/plugwise/data.py
@@ -86,7 +86,7 @@ def _detect_low_batteries(self) -> list[str]:
         mac_pattern = re.compile(r"(?:[0-9A-F]{2}){8}")
         matches = ["Battery", "below"]
         if self._notifications:
-            for msg_id, notification in list(self._notifications.items()):
+            for msg_id, notification in self._notifications.items():
                 mac_address: str | None = None
                 message: str | None = notification.get("message")
                 warning: str | None = notification.get("warning")
diff --git a/plugwise/helper.py b/plugwise/helper.py
index 87c4e986e..edd680747 100644
--- a/plugwise/helper.py
+++ b/plugwise/helper.py
@@ -723,7 +723,7 @@ def _scan_thermostats(self) -> None:
             for entity_id, entity in self.gw_entities.items():
                 self._rank_thermostat(thermo_matching, loc_id, entity_id, entity)
 
-        for loc_id, loc_data in list(self._thermo_locs.items()):
+        for loc_id, loc_data in self._thermo_locs.items():
             if loc_data["primary_prio"] != 0:
                 self._zones[loc_id] = {
                     "dev_class": "climate",

From af46088f10c3f96a67b012f4e24048f8da7ebf0e Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Fri, 27 Jun 2025 20:18:27 +0200
Subject: [PATCH 07/32] Use dict.copy() instead of list(dict)

---
 plugwise/data.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugwise/data.py b/plugwise/data.py
index 45cbe38db..29b8e0922 100644
--- a/plugwise/data.py
+++ b/plugwise/data.py
@@ -86,7 +86,7 @@ def _detect_low_batteries(self) -> list[str]:
         mac_pattern = re.compile(r"(?:[0-9A-F]{2}){8}")
         matches = ["Battery", "below"]
         if self._notifications:
-            for msg_id, notification in self._notifications.items():
+            for msg_id, notification in self._notifications.copy().items():
                 mac_address: str | None = None
                 message: str | None = notification.get("message")
                 warning: str | None = notification.get("warning")

From 548d445abf0aa57f3ced2a5cb0aae26026ec41c1 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Fri, 27 Jun 2025 20:23:16 +0200
Subject: [PATCH 08/32] Combine if's

---
 plugwise/data.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugwise/data.py b/plugwise/data.py
index 29b8e0922..cd36c9c4c 100644
--- a/plugwise/data.py
+++ b/plugwise/data.py
@@ -232,12 +232,12 @@ def _get_adam_data(self, entity: GwEntityData, data: GwEntityData) -> None:
             if self._on_off_device and isinstance(self._heating_valves(), int):
                 data["binary_sensors"]["heating_state"] = self._heating_valves() != 0
             # Add cooling_enabled binary_sensor
-            if "binary_sensors" in data:
-                if (
-                    "cooling_enabled" not in data["binary_sensors"]
-                    and self._cooling_present
-                ):
-                    data["binary_sensors"]["cooling_enabled"] = self._cooling_enabled
+            if (
+                "binary_sensors" in data
+                and "cooling_enabled" not in data["binary_sensors"]
+                and self._cooling_present
+            ):
+                data["binary_sensors"]["cooling_enabled"] = self._cooling_enabled
 
         # Show the allowed regulation_modes and gateway_modes
         if entity["dev_class"] == "gateway":

From 92ef5a6ca2e1b6da52675a8781cde6e2c9f3b3d4 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 09:08:29 +0200
Subject: [PATCH 09/32] Change boolean name to timeout_happened

---
 tests/test_init.py | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/tests/test_init.py b/tests/test_init.py
index d2384add6..cacd86d4f 100644
--- a/tests/test_init.py
+++ b/tests/test_init.py
@@ -92,7 +92,7 @@ async def load_testdata(
     def setup_app(
         self,
         broken=False,
-        timeout=False,
+        timeout_happened=False,
         raise_timeout=False,
         fail_auth=False,
         stretch=False,
@@ -108,7 +108,7 @@ def setup_app(
 
         if broken:
             app.router.add_get(CORE_DOMAIN_OBJECTS, self.smile_broken)
-        elif timeout:
+        elif timeout_happened:
             app.router.add_get(CORE_DOMAIN_OBJECTS, self.smile_timeout)
         else:
             app.router.add_get(CORE_DOMAIN_OBJECTS, self.smile_domain_objects)
@@ -135,7 +135,7 @@ def setup_app(
     def setup_legacy_app(
         self,
         broken=False,
-        timeout=False,
+        timeout_happened=False,
         raise_timeout=False,
         fail_auth=False,
         stretch=False,
@@ -151,7 +151,7 @@ def setup_legacy_app(
 
         if broken:
             app.router.add_get(CORE_LOCATIONS, self.smile_broken)
-        elif timeout:
+        elif timeout_happened:
             app.router.add_get(CORE_LOCATIONS, self.smile_timeout)
         else:
             app.router.add_get(CORE_LOCATIONS, self.smile_locations)
@@ -264,12 +264,12 @@ async def smile_fail_auth(cls, request):
         raise aiohttp.web.HTTPUnauthorized()
 
     @staticmethod
-    def connect_status(broken, timeout, fail_auth):
+    def connect_status(broken, timeout_happened, fail_auth):
         """Determine assumed status from settings."""
         assumed_status = 200
         if broken:
             assumed_status = 500
-        if timeout:
+        if timeout_happened:
             assumed_status = 504
         if fail_auth:
             assumed_status = 401
@@ -278,7 +278,7 @@ def connect_status(broken, timeout, fail_auth):
     async def connect(
         self,
         broken=False,
-        timeout=False,
+        timeout_happened=False,
         raise_timeout=False,
         fail_auth=False,
         stretch=False,
@@ -290,7 +290,7 @@ async def connect(
         )
 
         # Happy flow
-        app = self.setup_app(broken, timeout, raise_timeout, fail_auth, stretch)
+        app = self.setup_app(broken, timeout_happened, raise_timeout, fail_auth, stretch)
 
         server = aiohttp.test_utils.TestServer(
             app, port=port, scheme="http", host="127.0.0.1"
@@ -313,7 +313,7 @@ async def connect(
             timeoutpass_result = True
             assert timeoutpass_result
 
-        if not broken and not timeout and not fail_auth:
+        if not broken and not timeout_happened and not fail_auth:
             text = await resp.text()
             assert "xml" in text
 
@@ -340,7 +340,7 @@ async def connect(
             websession=websession,
         )
 
-        if not timeout:
+        if not timeout_happened:
             assert smile._timeout == 30
 
         # Connect to the smile
@@ -362,7 +362,7 @@ async def connect(
     async def connect_legacy(
         self,
         broken=False,
-        timeout=False,
+        timeout_happened=False,
         raise_timeout=False,
         fail_auth=False,
         stretch=False,
@@ -374,7 +374,7 @@ async def connect_legacy(
         )
 
         # Happy flow
-        app = self.setup_legacy_app(broken, timeout, raise_timeout, fail_auth, stretch)
+        app = self.setup_legacy_app(broken, timeout_happened, raise_timeout, fail_auth, stretch)
 
         server = aiohttp.test_utils.TestServer(
             app, port=port, scheme="http", host="127.0.0.1"
@@ -389,7 +389,7 @@ async def connect_legacy(
         # Try/exceptpass to accommodate for Timeout of aoihttp
         try:
             resp = await websession.get(url)
-            assumed_status = self.connect_status(broken, timeout, fail_auth)
+            assumed_status = self.connect_status(broken, timeout_happened, fail_auth)
             assert resp.status == assumed_status
             timeoutpass_result = False
             assert timeoutpass_result
@@ -397,7 +397,7 @@ async def connect_legacy(
             timeoutpass_result = True
             assert timeoutpass_result
 
-        if not broken and not timeout and not fail_auth:
+        if not broken and not timeout_happened and not fail_auth:
             text = await resp.text()
             assert "xml" in text
 
@@ -424,7 +424,7 @@ async def connect_legacy(
             websession=websession,
         )
 
-        if not timeout:
+        if not timeout_happened:
             assert smile._timeout == 30
 
         # Connect to the smile
@@ -464,7 +464,7 @@ async def connect_wrapper(
 
         try:
             _LOGGER.warning("Connecting to device exceeding timeout in response:")
-            await self.connect(timeout=True)
+            await self.connect(timeout_happened=True)
             _LOGGER.error(" - timeout not handled")  # pragma: no cover
             raise self.ConnectError  # pragma: no cover
         except pw_exceptions.ConnectionFailedError:
@@ -491,7 +491,7 @@ async def connect_legacy_wrapper(
 
         try:
             _LOGGER.warning("Connecting to device exceeding timeout in response:")
-            await self.connect_legacy(timeout=True)
+            await self.connect_legacy(timeout_happened=True)
             _LOGGER.error(" - timeout not handled")  # pragma: no cover
             raise self.ConnectError  # pragma: no cover
         except pw_exceptions.ConnectionFailedError:

From 25918eeb55798b562f8231d042b5b7c5002612d7 Mon Sep 17 00:00:00 2001
From: autoruff <plugwise@users.noreply.github.com>
Date: Sat, 28 Jun 2025 07:09:27 +0000
Subject: [PATCH 10/32] fixup: sc-fixes-2 Python code fixed using ruff

---
 tests/test_init.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/test_init.py b/tests/test_init.py
index cacd86d4f..d1e30fb98 100644
--- a/tests/test_init.py
+++ b/tests/test_init.py
@@ -290,7 +290,9 @@ async def connect(
         )
 
         # Happy flow
-        app = self.setup_app(broken, timeout_happened, raise_timeout, fail_auth, stretch)
+        app = self.setup_app(
+            broken, timeout_happened, raise_timeout, fail_auth, stretch
+        )
 
         server = aiohttp.test_utils.TestServer(
             app, port=port, scheme="http", host="127.0.0.1"
@@ -374,7 +376,9 @@ async def connect_legacy(
         )
 
         # Happy flow
-        app = self.setup_legacy_app(broken, timeout_happened, raise_timeout, fail_auth, stretch)
+        app = self.setup_legacy_app(
+            broken, timeout_happened, raise_timeout, fail_auth, stretch
+        )
 
         server = aiohttp.test_utils.TestServer(
             app, port=port, scheme="http", host="127.0.0.1"

From 71cd4203dba6d28a86e1102cf1f40207fb766670 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 09:11:53 +0200
Subject: [PATCH 11/32] Fix missed

---
 tests/test_init.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_init.py b/tests/test_init.py
index d1e30fb98..aae4f9adc 100644
--- a/tests/test_init.py
+++ b/tests/test_init.py
@@ -307,7 +307,7 @@ async def connect(
         # Try/exceptpass to accommodate for Timeout of aoihttp
         try:
             resp = await websession.get(url)
-            assumed_status = self.connect_status(broken, timeout, fail_auth)
+            assumed_status = self.connect_status(broken, timeout_happened, fail_auth)
             assert resp.status == assumed_status
             timeoutpass_result = False
             assert timeoutpass_result

From d70f24396a29661cd56d3c9702758429b3ff40f3 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 09:23:33 +0200
Subject: [PATCH 12/32] Test: combine connect-functions

---
 tests/test_init.py | 135 ++++++++++++---------------------------------
 1 file changed, 35 insertions(+), 100 deletions(-)

diff --git a/tests/test_init.py b/tests/test_init.py
index aae4f9adc..edfcbfac0 100644
--- a/tests/test_init.py
+++ b/tests/test_init.py
@@ -277,11 +277,14 @@ def connect_status(broken, timeout_happened, fail_auth):
 
     async def connect(
         self,
+        function,
         broken=False,
         timeout_happened=False,
         raise_timeout=False,
+        real_timeout_value=10,
         fail_auth=False,
         stretch=False,
+        url_part=CORE_DOMAIN_OBJECTS,
     ):
         """Connect to a smile environment and perform basic asserts."""
         port = aiohttp.test_utils.unused_port()
@@ -290,9 +293,7 @@ async def connect(
         )
 
         # Happy flow
-        app = self.setup_app(
-            broken, timeout_happened, raise_timeout, fail_auth, stretch
-        )
+        app = function(broken, timeout_happened, raise_timeout, fail_auth, stretch)
 
         server = aiohttp.test_utils.TestServer(
             app, port=port, scheme="http", host="127.0.0.1"
@@ -302,7 +303,7 @@ async def connect(
         client = aiohttp.test_utils.TestClient(server)
         websession = client.session
 
-        url = f"{server.scheme}://{server.host}:{server.port}{CORE_DOMAIN_OBJECTS}"
+        url = f"{server.scheme}://{server.host}:{server.port}{url_part}"
 
         # Try/exceptpass to accommodate for Timeout of aoihttp
         try:
@@ -350,93 +351,7 @@ async def connect(
         try:
             smile_version = await smile.connect()
             assert smile_version is not None
-            assert smile._timeout == 10
-            return server, smile, client
-        except (
-            pw_exceptions.ConnectionFailedError,
-            pw_exceptions.InvalidXMLError,
-            pw_exceptions.InvalidAuthentication,
-        ) as exception:
-            assert smile_version is None
-            await self.disconnect(server, client)
-            raise exception
-
-    async def connect_legacy(
-        self,
-        broken=False,
-        timeout_happened=False,
-        raise_timeout=False,
-        fail_auth=False,
-        stretch=False,
-    ):
-        """Connect to a smile environment and perform basic asserts."""
-        port = aiohttp.test_utils.unused_port()
-        test_password = "".join(
-            secrets.choice(string.ascii_lowercase) for _ in range(8)
-        )
-
-        # Happy flow
-        app = self.setup_legacy_app(
-            broken, timeout_happened, raise_timeout, fail_auth, stretch
-        )
-
-        server = aiohttp.test_utils.TestServer(
-            app, port=port, scheme="http", host="127.0.0.1"
-        )
-        await server.start_server()
-
-        client = aiohttp.test_utils.TestClient(server)
-        websession = client.session
-
-        url = f"{server.scheme}://{server.host}:{server.port}{CORE_LOCATIONS}"
-
-        # Try/exceptpass to accommodate for Timeout of aoihttp
-        try:
-            resp = await websession.get(url)
-            assumed_status = self.connect_status(broken, timeout_happened, fail_auth)
-            assert resp.status == assumed_status
-            timeoutpass_result = False
-            assert timeoutpass_result
-        except Exception:  # pylint: disable=broad-except
-            timeoutpass_result = True
-            assert timeoutpass_result
-
-        if not broken and not timeout_happened and not fail_auth:
-            text = await resp.text()
-            assert "xml" in text
-
-        # Test lack of websession
-        try:
-            smile = pw_smile.Smile(
-                host=server.host,
-                username=pw_constants.DEFAULT_USERNAME,
-                password=test_password,
-                port=server.port,
-                websession=None,
-            )
-            lack_of_websession = False
-            assert lack_of_websession
-        except Exception:  # pylint: disable=broad-except
-            lack_of_websession = True
-            assert lack_of_websession
-
-        smile = pw_smile.Smile(
-            host=server.host,
-            username=pw_constants.DEFAULT_USERNAME,
-            password=test_password,
-            port=server.port,
-            websession=websession,
-        )
-
-        if not timeout_happened:
-            assert smile._timeout == 30
-
-        # Connect to the smile
-        smile_version = None
-        try:
-            smile_version = await smile.connect()
-            assert smile_version is not None
-            assert smile._timeout == 30
+            assert smile._timeout == real_timeout_value
             return server, smile, client
         except (
             pw_exceptions.ConnectionFailedError,
@@ -455,7 +370,7 @@ async def connect_wrapper(
         if fail_auth:
             try:
                 _LOGGER.warning("Connecting to device with invalid credentials:")
-                await self.connect(fail_auth=fail_auth)
+                await self.connect(self.setup_app, fail_auth=fail_auth)
                 _LOGGER.error(" - invalid credentials not handled")  # pragma: no cover
                 raise self.ConnectError  # pragma: no cover
             except pw_exceptions.InvalidAuthentication as exc:
@@ -464,11 +379,11 @@ async def connect_wrapper(
 
         if raise_timeout:
             _LOGGER.warning("Connecting to device exceeding timeout in handling:")
-            return await self.connect(raise_timeout=True)
+            return await self.connect(self.setup_app, raise_timeout=True)
 
         try:
             _LOGGER.warning("Connecting to device exceeding timeout in response:")
-            await self.connect(timeout_happened=True)
+            await self.connect(self.setup_app, timeout_happened=True)
             _LOGGER.error(" - timeout not handled")  # pragma: no cover
             raise self.ConnectError  # pragma: no cover
         except pw_exceptions.ConnectionFailedError:
@@ -476,14 +391,14 @@ async def connect_wrapper(
 
         try:
             _LOGGER.warning("Connecting to device with missing data:")
-            await self.connect(broken=True)
+            await self.connect(self.setup_app, broken=True)
             _LOGGER.error(" - broken information not handled")  # pragma: no cover
             raise self.ConnectError  # pragma: no cover
         except pw_exceptions.InvalidXMLError:
             _LOGGER.info(" + successfully passed XML issue handling.")
 
         _LOGGER.info("Connecting to functioning device:")
-        return await self.connect(stretch=stretch)
+        return await self.connect(self.setup_app, stretch=stretch)
 
     async def connect_legacy_wrapper(
         self, raise_timeout=False, fail_auth=False, stretch=False
@@ -491,11 +406,21 @@ async def connect_legacy_wrapper(
         """Wrap connect to try negative testing before positive testing."""
         if raise_timeout:
             _LOGGER.warning("Connecting to device exceeding timeout in handling:")
-            return await self.connect_legacy(raise_timeout=True)
+            return await self.connect(
+                self.setup_legacy_app,
+                raise_timeout=True,
+                real_timeout_value=30,
+                url_part=CORE_LOCATIONS,
+            )
 
         try:
             _LOGGER.warning("Connecting to device exceeding timeout in response:")
-            await self.connect_legacy(timeout_happened=True)
+            await self.connect(
+                self.setup_legacy_app,
+                real_timeout_value=30,
+                timeout_happened=True,
+                url_part=CORE_LOCATIONS,
+            )
             _LOGGER.error(" - timeout not handled")  # pragma: no cover
             raise self.ConnectError  # pragma: no cover
         except pw_exceptions.ConnectionFailedError:
@@ -503,14 +428,24 @@ async def connect_legacy_wrapper(
 
         try:
             _LOGGER.warning("Connecting to device with missing data:")
-            await self.connect_legacy(broken=True)
+            await self.connect(
+                self.setup_legacy_app,
+                broken=True,
+                real_timeout_value=30,
+                url_part=CORE_LOCATIONS,
+            )
             _LOGGER.error(" - broken information not handled")  # pragma: no cover
             raise self.ConnectError  # pragma: no cover
         except pw_exceptions.InvalidXMLError:
             _LOGGER.info(" + successfully passed XML issue handling.")
 
         _LOGGER.info("Connecting to functioning device:")
-        return await self.connect_legacy(stretch=stretch)
+        return await self.connect(
+            self.setup_legacy_app,
+            real_timeout_value=30,
+            stretch=stretch,
+            url_part=CORE_LOCATIONS,
+        )
 
     # Generic disconnect
     @classmethod

From b18aa6b882759d825741c98944007f42cd189329 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 10:45:12 +0200
Subject: [PATCH 13/32] Define smile-Munch

---
 plugwise/__init__.py      | 90 +++++++++++++++++----------------------
 plugwise/common.py        |  9 ++--
 plugwise/helper.py        | 12 +++---
 plugwise/legacy/helper.py | 34 +++++++--------
 plugwise/legacy/smile.py  | 20 ++-------
 plugwise/smile.py         | 24 +++--------
 6 files changed, 74 insertions(+), 115 deletions(-)

diff --git a/plugwise/__init__.py b/plugwise/__init__.py
index 9c56faa6a..fac6a65bf 100644
--- a/plugwise/__init__.py
+++ b/plugwise/__init__.py
@@ -36,6 +36,7 @@
 
 import aiohttp
 from defusedxml import ElementTree as etree
+from munch import Munch
 from packaging.version import Version, parse
 
 
@@ -72,16 +73,17 @@ def __init__(
         self._smile_api: SmileAPI | SmileLegacyAPI
         self._stretch_v2 = False
         self._target_smile: str = NONE
-        self.smile_hostname: str = NONE
-        self.smile_hw_version: str | None = None
-        self.smile_legacy = False
-        self.smile_mac_address: str | None = None
-        self.smile_model: str = NONE
-        self.smile_model_id: str | None = None
-        self.smile_name: str = NONE
-        self.smile_type: str = NONE
-        self.smile_version: Version = Version("0.0.0")
-        self.smile_zigbee_mac_address: str | None = None
+        self.smile: Munch = Munch()
+        self.smile.hostname: str = NONE
+        self.smile.hw_version: str | None = None
+        self.smile.legacy = False
+        self.smile.mac_address: str | None = None
+        self.smile.model: str = NONE
+        self.smile.model_id: str | None = None
+        self.smile.name: str = NONE
+        self.smile.type: str = NONE
+        self.smile.version: Version = Version("0.0.0")
+        self.smile.zigbee_mac_address: str | None = None
 
     @property
     def cooling_present(self) -> bool:
@@ -109,7 +111,7 @@ def reboot(self) -> bool:
 
         All non-legacy devices support gateway-rebooting.
         """
-        return not self.smile_legacy
+        return not self.smile.legacy
 
     async def connect(self) -> Version:
         """Connect to the Plugwise Gateway and determine its name, type, version, and other data."""
@@ -158,16 +160,9 @@ async def connect(self) -> Version:
                 self._opentherm_device,
                 self._request,
                 self._schedule_old_states,
-                self.smile_hostname,
-                self.smile_hw_version,
-                self.smile_mac_address,
-                self.smile_model,
-                self.smile_model_id,
-                self.smile_name,
-                self.smile_type,
-                self.smile_version,
+                self.smile,
             )
-            if not self.smile_legacy
+            if not self.smile.legacy
             else SmileLegacyAPI(
                 self._is_thermostat,
                 self._loc_data,
@@ -176,21 +171,14 @@ async def connect(self) -> Version:
                 self._request,
                 self._stretch_v2,
                 self._target_smile,
-                self.smile_hostname,
-                self.smile_hw_version,
-                self.smile_mac_address,
-                self.smile_model,
-                self.smile_name,
-                self.smile_type,
-                self.smile_version,
-                self.smile_zigbee_mac_address,
+                self.smile,
             )
         )
 
         # Update all endpoints on first connect
         await self._smile_api.full_xml_update()
 
-        return self.smile_version
+        return self.smile.version
 
     async def _smile_detect(
         self, result: etree.Element, dsmrmain: etree.Element
@@ -203,15 +191,15 @@ async def _smile_detect(
         if (gateway := result.find("./gateway")) is not None:
             if (v_model := gateway.find("vendor_model")) is not None:
                 model = v_model.text
-            self.smile_version = parse(gateway.find("firmware_version").text)
-            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
-            self.smile_model_id = gateway.find("vendor_model").text
+            self.smile.version = parse(gateway.find("firmware_version").text)
+            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
+            self.smile._model_id = gateway.find("vendor_model").text
         else:
             model = await self._smile_detect_legacy(result, dsmrmain, model)
 
-        if model == "Unknown" or self.smile_version is None:  # pragma: no cover
+        if model == "Unknown" or self.smile.version is None:  # pragma: no cover
             # Corner case check
             LOGGER.error(
                 "Unable to find model or version information, please create"
@@ -219,7 +207,7 @@ async def _smile_detect(
             )
             raise UnsupportedDeviceError
 
-        version_major = str(self.smile_version.major)
+        version_major = str(self.smile.version.major)
         self._target_smile = f"{model}_v{version_major}"
         LOGGER.debug("Plugwise identified as %s", self._target_smile)
         if self._target_smile not in SMILES:
@@ -230,7 +218,7 @@ async def _smile_detect(
             )
             raise UnsupportedDeviceError
 
-        if not self.smile_legacy:
+        if not self.smile.legacy:
             self._timeout = DEFAULT_TIMEOUT
 
         if self._target_smile in ("smile_open_therm_v2", "smile_thermo_v3"):
@@ -240,14 +228,14 @@ async def _smile_detect(
             )  # pragma: no cover
             raise UnsupportedDeviceError  # pragma: no cover
 
-        self.smile_model = "Gateway"
-        self.smile_name = SMILES[self._target_smile].smile_name
-        self.smile_type = SMILES[self._target_smile].smile_type
+        self.smile.model = "Gateway"
+        self.smile.name = SMILES[self._target_smile].smile_name
+        self.smile.type = SMILES[self._target_smile].smile_type
 
-        if self.smile_type == "stretch":
+        if self.smile.type == "stretch":
             self._stretch_v2 = int(version_major) == 2
 
-        if self.smile_type == "thermostat":
+        if self.smile.type == "thermostat":
             self._is_thermostat = True
             # For Adam, Anna, determine the system capabilities:
             # Find the connected heating/cooling device (heater_central),
@@ -275,13 +263,13 @@ async def _smile_detect_legacy(
         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
+            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
+                    self.smile.zigbee_mac_address = network.find("mac_address").text
 
         # Legacy Anna or Stretch:
         if (
@@ -289,22 +277,22 @@ async def _smile_detect_legacy(
             or network is not None
         ):
             system = await self._request(SYSTEM)
-            self.smile_version = parse(system.find("./gateway/firmware").text)
+            self.smile.version = parse(system.find("./gateway/firmware").text)
             return_model = str(system.find("./gateway/product").text)
-            self.smile_hostname = system.find("./gateway/hostname").text
+            self.smile.hostname = system.find("./gateway/hostname").text
             # If wlan0 contains data it's active, eth0 should be checked last as is preferred
             for network in ("wlan0", "eth0"):
                 locator = f"./{network}/mac"
                 if (net_locator := system.find(locator)) is not None:
-                    self.smile_mac_address = net_locator.text
+                    self.smile.mac_address = net_locator.text
 
         # P1 legacy:
         elif dsmrmain is not None:
             status = await self._request(STATUS)
-            self.smile_version = parse(status.find("./system/version").text)
+            self.smile.version = parse(status.find("./system/version").text)
             return_model = str(status.find("./system/product").text)
-            self.smile_hostname = status.find("./network/hostname").text
-            self.smile_mac_address = status.find("./network/mac_address").text
+            self.smile.hostname = status.find("./network/hostname").text
+            self.smile.mac_address = status.find("./network/mac_address").text
         else:  # pragma: no cover
             # No cornercase, just end of the line
             LOGGER.error(
@@ -313,7 +301,7 @@ async def _smile_detect_legacy(
             )
             raise ResponseError
 
-        self.smile_legacy = True
+        self.smile.legacy = True
         return return_model
 
     async def async_update(self) -> dict[str, GwEntityData]:
diff --git a/plugwise/common.py b/plugwise/common.py
index c261eeb4b..be57505e1 100644
--- a/plugwise/common.py
+++ b/plugwise/common.py
@@ -55,17 +55,16 @@ def __init__(self) -> None:
         self._heater_id: str = NONE
         self._on_off_device: bool
         self.gw_entities: dict[str, GwEntityData] = {}
-        self.smile_name: str
-        self.smile_type: str
+        self.smile: Munch
 
     @property
     def heater_id(self) -> str:
         """Return the heater-id."""
         return self._heater_id
 
-    def smile(self, name: str) -> bool:
+    def check_name(self, name: str) -> bool:
         """Helper-function checking the smile-name."""
-        return self.smile_name == name
+        return self.smile.name == name
 
     def _appl_heater_central_info(
         self,
@@ -173,7 +172,7 @@ def _get_group_switches(self) -> dict[str, GwEntityData]:
         """
         switch_groups: dict[str, GwEntityData] = {}
         # P1 and Anna don't have switchgroups
-        if self.smile_type == "power" or self.smile(ANNA):
+        if self.smile.type == "power" or self.check_name(ANNA):
             return switch_groups
 
         for group in self._domain_objects.findall("./group"):
diff --git a/plugwise/helper.py b/plugwise/helper.py
index edd680747..b370b9316 100644
--- a/plugwise/helper.py
+++ b/plugwise/helper.py
@@ -277,7 +277,7 @@ def _appl_gateway_info(self, appl: Munch, appliance: etree.Element) -> Munch:
         appl.vendor_name = "Plugwise"
 
         # Adam: collect the ZigBee MAC address of the Smile
-        if self.smile(ADAM):
+        if self.check_name(ADAM):
             if (
                 found := self._domain_objects.find(".//protocols/zig_bee_coordinator")
             ) is not None:
@@ -383,7 +383,7 @@ def _get_measurement_data(self, entity_id: str) -> GwEntityData:
             data.pop("c_heating_state")
             self._count -= 1
 
-        if self._is_thermostat and self.smile(ANNA):
+        if self._is_thermostat and self.check_name(ANNA):
             self._update_anna_cooling(entity_id, data)
 
         self._cleanup_data(data)
@@ -484,7 +484,7 @@ def _get_actuator_functionalities(
                 item == "thermostat"
                 and (
                     entity["dev_class"] != "climate"
-                    if self.smile(ADAM)
+                    if self.check_name(ADAM)
                     else entity["dev_class"] != "thermostat"
                 )
             ):
@@ -539,7 +539,7 @@ def _get_actuator_mode(
 
         Collect the requested gateway mode.
         """
-        if not (self.smile(ADAM) and entity_id == self._gateway_id):
+        if not (self.check_name(ADAM) and entity_id == self._gateway_id):
             return None
 
         if (search := search_actuator_functionalities(appliance, key)) is not None:
@@ -605,10 +605,10 @@ def _process_on_off_device_c_heating_state(self, data: GwEntityData) -> None:
 
         Solution for Core issue #81839.
         """
-        if self.smile(ANNA):
+        if self.check_name(ANNA):
             data["binary_sensors"]["heating_state"] = data["c_heating_state"]
 
-        if self.smile(ADAM):
+        if self.check_name(ADAM):
             # First count when not present, then create and init to False.
             # When present init to False
             if "heating_state" not in data["binary_sensors"]:
diff --git a/plugwise/legacy/helper.py b/plugwise/legacy/helper.py
index e22b489e5..37cf3992d 100644
--- a/plugwise/legacy/helper.py
+++ b/plugwise/legacy/helper.py
@@ -73,10 +73,10 @@ def __init__(self) -> None:
         self._modules: etree.Element
         self._stretch_v2: bool
         self.gw_entities: dict[str, GwEntityData] = {}
-        self.smile_mac_address: str | None
-        self.smile_model: str
-        self.smile_version: Version
-        self.smile_zigbee_mac_address: str | None
+        self.smile.mac_address: str | None
+        self.smile.model: str
+        self.smile.version: Version
+        self.smile.zigbee_mac_address: str | None
 
     @property
     def gateway_id(self) -> str:
@@ -95,7 +95,7 @@ def _all_appliances(self) -> None:
 
         self._create_legacy_gateway()
         # For legacy P1 collect the connected SmartMeter info
-        if self.smile_type == "power":
+        if self.smile.type == "power":
             appl = Munch()
             self._p1_smartmeter_info_finder(appl)
             # Legacy P1 has no more devices
@@ -167,13 +167,13 @@ def _all_locations(self) -> None:
             loc.loc_id = location.attrib["id"]
             # Filter the valid single location for P1 legacy: services not empty
             locator = "./services"
-            if self.smile_type == "power" and len(location.find(locator)) == 0:
+            if self.smile.type == "power" and len(location.find(locator)) == 0:
                 continue
 
             if loc.name == "Home":
                 self._home_loc_id = loc.loc_id
             # Replace location-name for P1 legacy, can contain privacy-related info
-            if self.smile_type == "power":
+            if self.smile.type == "power":
                 loc.name = "Home"
                 self._home_loc_id = loc.loc_id
 
@@ -185,18 +185,18 @@ def _create_legacy_gateway(self) -> None:
         Use the home_location or FAKE_APPL as entity id.
         """
         self._gateway_id = self._home_loc_id
-        if self.smile_type == "power":
+        if self.smile.type == "power":
             self._gateway_id = FAKE_APPL
 
         self.gw_entities[self._gateway_id] = {"dev_class": "gateway"}
         self._count += 1
         for key, value in {
-            "firmware": str(self.smile_version),
+            "firmware": str(self.smile.version),
             "location": self._home_loc_id,
-            "mac_address": self.smile_mac_address,
-            "model": self.smile_model,
-            "name": self.smile_name,
-            "zigbee_mac_address": self.smile_zigbee_mac_address,
+            "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:
@@ -224,14 +224,14 @@ def _energy_entity_info_finder(self, appliance: etree, appl: Munch) -> Munch:
 
         Collect energy entity info (Smartmeter, Circle, Stealth, etc.): firmware, model and vendor name.
         """
-        if self.smile_type in ("power", "stretch"):
+        if self.smile.type in ("power", "stretch"):
             locator = "./services/electricity_point_meter"
             module_data = self._get_module_data(
                 appliance, locator, self._modules, legacy=True
             )
             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":
+            if appl.zigbee_mac is None and self.smile.type != "power":
                 return None
 
             appl.hardware = module_data["hardware_version"]
@@ -253,7 +253,7 @@ def _p1_smartmeter_info_finder(self, appl: Munch) -> None:
         appl.entity_id = loc_id
         appl.location = loc_id
         appl.mac = None
-        appl.model = self.smile_model
+        appl.model = self.smile.model
         appl.model_id = None
         appl.name = "P1"
         appl.pwclass = "smartmeter"
@@ -272,7 +272,7 @@ def _get_measurement_data(self, entity_id: str) -> GwEntityData:
         # Get P1 smartmeter data from MODULES
         entity = self.gw_entities[entity_id]
         # !! DON'T CHANGE below two if-lines, will break stuff !!
-        if self.smile_type == "power":
+        if self.smile.type == "power":
             if entity["dev_class"] == "smartmeter":
                 data.update(self._power_data_from_modules())
 
diff --git a/plugwise/legacy/smile.py b/plugwise/legacy/smile.py
index fc4f3a2c5..68108163a 100644
--- a/plugwise/legacy/smile.py
+++ b/plugwise/legacy/smile.py
@@ -44,14 +44,7 @@ def __init__(
         _request: Callable[..., Awaitable[Any]],
         _stretch_v2: bool,
         _target_smile: str,
-        smile_hostname: str,
-        smile_hw_version: str | None,
-        smile_mac_address: str | None,
-        smile_model: str,
-        smile_name: str,
-        smile_type: str,
-        smile_version: Version,
-        smile_zigbee_mac_address: str | None,
+        smile: Munch,
     ) -> None:
         """Set the constructor for this class."""
         super().__init__()
@@ -63,14 +56,7 @@ def __init__(
         self._request = _request
         self._stretch_v2 = _stretch_v2
         self._target_smile = _target_smile
-        self.smile_hostname = smile_hostname
-        self.smile_hw_version = smile_hw_version
-        self.smile_mac_address = smile_mac_address
-        self.smile_model = smile_model
-        self.smile_name = smile_name
-        self.smile_type = smile_type
-        self.smile_version = smile_version
-        self.smile_zigbee_mac_address = smile_zigbee_mac_address
+        self.smile = smile
 
         self._first_update = True
         self._previous_day_number: str = "0"
@@ -86,7 +72,7 @@ async def full_xml_update(self) -> None:
         self._locations = await self._request(LOCATIONS)
         self._modules = await self._request(MODULES)
         # P1 legacy has no appliances
-        if self.smile_type != "power":
+        if self.smile.type != "power":
             self._appliances = await self._request(APPLIANCES)
 
     def get_all_gateway_entities(self) -> None:
diff --git a/plugwise/smile.py b/plugwise/smile.py
index 0947401d4..1095b34f4 100644
--- a/plugwise/smile.py
+++ b/plugwise/smile.py
@@ -54,14 +54,7 @@ def __init__(
         _opentherm_device: bool,
         _request: Callable[..., Awaitable[Any]],
         _schedule_old_states: dict[str, dict[str, str]],
-        smile_hostname: str | None,
-        smile_hw_version: str | None,
-        smile_mac_address: str | None,
-        smile_model: str,
-        smile_model_id: str | None,
-        smile_name: str,
-        smile_type: str,
-        smile_version: Version,
+        smile: Munch,
     ) -> None:
         """Set the constructor for this class."""
         super().__init__()
@@ -74,14 +67,7 @@ def __init__(
         self._opentherm_device = _opentherm_device
         self._request = _request
         self._schedule_old_states = _schedule_old_states
-        self.smile_hostname = smile_hostname
-        self.smile_hw_version = smile_hw_version
-        self.smile_mac_address = smile_mac_address
-        self.smile_model = smile_model
-        self.smile_model_id = smile_model_id
-        self.smile_name = smile_name
-        self.smile_type = smile_type
-        self.smile_version = smile_version
+        self.smile = smile
         self.therms_with_offset_func: list[str] = []
 
     @property
@@ -107,7 +93,7 @@ def get_all_gateway_entities(self) -> None:
             self.therms_with_offset_func = (
                 self._get_appliances_with_offset_functionality()
             )
-            if self.smile(ADAM):
+            if self.check_name(ADAM):
                 self._scan_thermostats()
 
         if group_data := self._get_group_switches():
@@ -340,7 +326,7 @@ async def set_schedule_state(
         template = (
             '<template tag="zone_preset_based_on_time_and_presence_with_override" />'
         )
-        if self.smile(ANNA):
+        if self.check_name(ANNA):
             locator = f'.//*[@id="{schedule_rule_id}"]/template'
             template_id = self._domain_objects.find(locator).attrib["id"]
             template = f'<template id="{template_id}" />'
@@ -476,7 +462,7 @@ async def set_temperature(self, loc_id: str, items: dict[str, float]) -> None:
         if "setpoint" in items:
             setpoint = items["setpoint"]
 
-        if self.smile(ANNA) and self._cooling_present:
+        if self.check_name(ANNA) and self._cooling_present:
             if "setpoint_high" not in items:
                 raise PlugwiseError(
                     "Plugwise: failed setting temperature: no valid input provided"

From e4958c546bc3518a8a3367210809c30810ec9532 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 10:57:04 +0200
Subject: [PATCH 14/32] Update test-related

---
 tests/test_adam.py | 12 ++++++------
 tests/test_init.py | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/test_adam.py b/tests/test_adam.py
index 1ef41c0de..46287b84a 100644
--- a/tests/test_adam.py
+++ b/tests/test_adam.py
@@ -23,7 +23,7 @@ async def test_connect_adam_plus_anna_new(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -192,7 +192,7 @@ async def test_connect_adam_plus_anna_new_regulation_off(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         await self.device_test(smile, "2023-12-17 00:00:01", testdata)
 
@@ -206,7 +206,7 @@ async def test_connect_adam_zone_per_device(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -287,7 +287,7 @@ async def test_connect_adam_multiple_devices_per_zone(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -361,7 +361,7 @@ async def test_connect_adam_onoff_cooling_fake_firmware(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -384,7 +384,7 @@ async def test_connect_adam_plus_anna(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
diff --git a/tests/test_init.py b/tests/test_init.py
index edfcbfac0..e7ce8314a 100644
--- a/tests/test_init.py
+++ b/tests/test_init.py
@@ -547,7 +547,7 @@ def test_and_assert(test_dict, data, header):
             if initialize:
                 _LOGGER.info("Asserting testdata:")
                 data = await smile.async_update()
-                if smile.smile_legacy:
+                if smile.smile.legacy:
                     assert smile._timeout == 30
                 else:
                     assert smile._timeout == 10
@@ -557,7 +557,7 @@ def test_and_assert(test_dict, data, header):
 
         _LOGGER.info("Gateway id = %s", smile.gateway_id)
         _LOGGER.info("Heater id = %s", smile.heater_id)
-        _LOGGER.info("Hostname = %s", smile.smile_hostname)
+        _LOGGER.info("Hostname = %s", smile.smile.hostname)
         _LOGGER.info("Entities list = %s", data)
 
         self.cooling_present = smile.cooling_present
@@ -670,7 +670,7 @@ async def tinker_thermostat_temp(
         tinker_temp_passed = False
         test_temp = {"setpoint": 22.9}
         if self.cooling_present and not block_cooling:
-            if smile.smile_name == "Smile Anna":
+            if smile.smile.name == "Smile Anna":
                 if self._cooling_enabled:
                     test_temp = {"setpoint_low": 4.0, "setpoint_high": 23.0}
                 else:
@@ -999,17 +999,17 @@ def validate_test_basics(
         if smile_type:
             log_msg = f" # Assert type matching {smile_type}"
             parent_logger.info(log_msg)
-            assert smile.smile_type == smile_type
+            assert smile.smile.type == smile_type
         if smile_version:
             log_msg = f" # Assert version matching '{smile_version}"
             parent_logger.info(log_msg)
-            assert smile.smile_version == version.parse(smile_version)
+            assert smile.smile.version == version.parse(smile_version)
         log_msg = f" # Assert legacy {smile_legacy}"
         parent_logger.info(log_msg)
         if smile_legacy:
-            assert smile.smile_legacy
+            assert smile.smile.legacy
         else:
-            assert not smile.smile_legacy
+            assert not smile.smile.legacy
 
     class PlugwiseTestError(Exception):
         """Plugwise test exceptions class."""

From cac6a8ea9a7a7b3bb28f85d3e2e76e76a16a5013 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 11:01:26 +0200
Subject: [PATCH 15/32] More updates

---
 plugwise/__init__.py |  2 +-
 plugwise/data.py     |  8 ++++----
 plugwise/helper.py   | 31 ++++++++++++++++---------------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/plugwise/__init__.py b/plugwise/__init__.py
index fac6a65bf..89923a94a 100644
--- a/plugwise/__init__.py
+++ b/plugwise/__init__.py
@@ -195,7 +195,7 @@ async def _smile_detect(
             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
-            self.smile._model_id = gateway.find("vendor_model").text
+            self.smile.model_id = gateway.find("vendor_model").text
         else:
             model = await self._smile_detect_legacy(result, dsmrmain, model)
 
diff --git a/plugwise/data.py b/plugwise/data.py
index cd36c9c4c..7553dc7b7 100644
--- a/plugwise/data.py
+++ b/plugwise/data.py
@@ -35,7 +35,7 @@ def _all_entity_data(self) -> None:
         Collect data for each entity and add to self.gw_entities.
         """
         self._update_gw_entities()
-        if self.smile(ADAM):
+        if self.check_name(ADAM):
             self._update_zones()
             self.gw_entities.update(self._zones)
 
@@ -124,7 +124,7 @@ def _update_for_cooling(self, entity: GwEntityData) -> 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)
+            self.check_name(ANNA)
             and self._cooling_present
             and entity["dev_class"] == "thermostat"
         ):
@@ -194,11 +194,11 @@ def _get_entity_data(self, entity_id: str) -> GwEntityData:
         # Switching groups data
         self._entity_switching_group(entity, data)
         # Adam data
-        if self.smile(ADAM):
+        if self.check_name(ADAM):
             self._get_adam_data(entity, data)
 
         # Thermostat data for Anna (presets, temperatures etc)
-        if self.smile(ANNA) and entity["dev_class"] == "thermostat":
+        if self.check_name(ANNA) and entity["dev_class"] == "thermostat":
             self._climate_data(entity_id, entity, data)
             self._get_anna_control_state(data)
 
diff --git a/plugwise/helper.py b/plugwise/helper.py
index b370b9316..774aa18ee 100644
--- a/plugwise/helper.py
+++ b/plugwise/helper.py
@@ -85,11 +85,12 @@ def __init__(self) -> None:
         self._gateway_id: str = NONE
         self._zones: dict[str, GwEntityData]
         self.gw_entities: dict[str, GwEntityData]
-        self.smile_hw_version: str | None
-        self.smile_mac_address: str | None
-        self.smile_model: str
-        self.smile_model_id: str | None
-        self.smile_version: version.Version
+        self.smile: Munch = Munch()
+        self.smile.hw_version: str | None
+        self.smile.mac_address: str | None
+        self.smile.model: str
+        self.smile.model_id: str | None
+        self.smile.version: version.Version
 
     @property
     def gateway_id(self) -> str:
@@ -160,7 +161,7 @@ def _all_appliances(self) -> None:
 
             self._create_gw_entities(appl)
 
-        if self.smile_type == "power":
+        if self.smile.type == "power":
             self._get_p1_smartmeter_info()
 
         # Sort the gw_entities
@@ -268,12 +269,12 @@ 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.attrib["id"]
-        appl.firmware = str(self.smile_version)
-        appl.hardware = self.smile_hw_version
-        appl.mac = self.smile_mac_address
-        appl.model = self.smile_model
-        appl.model_id = self.smile_model_id
-        appl.name = self.smile_name
+        appl.firmware = str(self.smile.version)
+        appl.hardware = self.smile.hw_version
+        appl.mac = self.smile.mac_address
+        appl.model = self.smile.model
+        appl.model_id = self.smile.model_id
+        appl.name = self.smile.name
         appl.vendor_name = "Plugwise"
 
         # Adam: collect the ZigBee MAC address of the Smile
@@ -346,7 +347,7 @@ def _get_measurement_data(self, entity_id: str) -> GwEntityData:
         # Get P1 smartmeter data from LOCATIONS
         entity = self.gw_entities[entity_id]
         # !! DON'T CHANGE below two if-lines, will break stuff !!
-        if self.smile_type == "power":
+        if self.smile.type == "power":
             if entity["dev_class"] == "smartmeter":
                 data.update(self._power_data_from_location())
 
@@ -799,8 +800,8 @@ def _control_state(self, data: GwEntityData, loc_id: str) -> str | bool:
 
         # Handle missing control_state in regulation_mode off for firmware >= 3.2.0 (issue #776)
         # In newer firmware versions, default to "off" when control_state is not present
-        if self.smile_version != version.Version("0.0.0"):
-            if self.smile_version >= version.parse("3.2.0"):
+        if self.smile.version != version.Version("0.0.0"):
+            if self.smile.version >= version.parse("3.2.0"):
                 return "off"
 
             # Older Adam firmware does not have the control_state xml-key

From 55dee8be47659fcbbd700c0a75136b334b4edcee Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 11:38:39 +0200
Subject: [PATCH 16/32] More test-related updates

---
 tests/test_anna.py           | 28 ++++++++++++++--------------
 tests/test_legacy_anna.py    |  4 ++--
 tests/test_legacy_p1.py      |  4 ++--
 tests/test_legacy_stretch.py |  6 +++---
 tests/test_p1.py             |  4 ++--
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/tests/test_anna.py b/tests/test_anna.py
index 92efae3d9..e2210d91a 100644
--- a/tests/test_anna.py
+++ b/tests/test_anna.py
@@ -19,7 +19,7 @@ async def test_connect_anna_v4(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -99,7 +99,7 @@ async def test_connect_anna_v4_dhw(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -129,7 +129,7 @@ async def test_connect_anna_v4_no_tag(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -157,7 +157,7 @@ async def test_connect_anna_without_boiler_fw441(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -185,7 +185,7 @@ async def test_connect_anna_heatpump_heating(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -242,7 +242,7 @@ async def test_connect_anna_heatpump_cooling(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -289,7 +289,7 @@ async def test_connect_anna_heatpump_cooling_fake_firmware(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -314,7 +314,7 @@ async def test_connect_anna_elga_no_cooling(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -339,7 +339,7 @@ async def test_connect_anna_elga_2(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -368,7 +368,7 @@ async def test_connect_anna_elga_2_schedule_off(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         await self.device_test(smile, "2022-03-13 00:00:01", testdata)
         assert (
@@ -393,7 +393,7 @@ async def test_connect_anna_elga_2_cooling(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -450,7 +450,7 @@ async def test_connect_anna_loria_heating_idle(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -518,7 +518,7 @@ async def test_connect_anna_loria_cooling_active(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -542,7 +542,7 @@ async def test_connect_anna_loria_driessens(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
diff --git a/tests/test_legacy_anna.py b/tests/test_legacy_anna.py
index 1a2e7e20f..8efecf2a5 100644
--- a/tests/test_legacy_anna.py
+++ b/tests/test_legacy_anna.py
@@ -19,7 +19,7 @@ async def test_connect_legacy_anna(self):
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
 
         server, smile, client = await self.connect_legacy_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -55,7 +55,7 @@ async def test_connect_legacy_anna_2(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_legacy_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
diff --git a/tests/test_legacy_p1.py b/tests/test_legacy_p1.py
index 52f1d8504..95bd94a93 100644
--- a/tests/test_legacy_p1.py
+++ b/tests/test_legacy_p1.py
@@ -17,7 +17,7 @@ async def test_connect_smile_p1_v2(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_legacy_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -41,7 +41,7 @@ async def test_connect_smile_p1_v2_2(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_legacy_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
diff --git a/tests/test_legacy_stretch.py b/tests/test_legacy_stretch.py
index 13d079020..0d29766cb 100644
--- a/tests/test_legacy_stretch.py
+++ b/tests/test_legacy_stretch.py
@@ -17,7 +17,7 @@ async def test_connect_stretch_v31(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_legacy_wrapper(stretch=True)
-        assert smile.smile_hostname == "stretch000000"
+        assert smile.smile.hostname == "stretch000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -57,7 +57,7 @@ async def test_connect_stretch_v23(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_legacy_wrapper(stretch=True)
-        assert smile.smile_hostname == "stretch000000"
+        assert smile.smile.hostname == "stretch000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -96,7 +96,7 @@ async def test_connect_stretch_v27_no_domain(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_legacy_wrapper(stretch=True)
-        assert smile.smile_hostname == "stretch000000"
+        assert smile.smile.hostname == "stretch000000"
 
         self.validate_test_basics(
             _LOGGER,
diff --git a/tests/test_p1.py b/tests/test_p1.py
index e379573e6..e76b619c6 100644
--- a/tests/test_p1.py
+++ b/tests/test_p1.py
@@ -17,7 +17,7 @@ async def test_connect_p1v4_442_single(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,
@@ -67,7 +67,7 @@ async def test_connect_p1v4_442_triple(self):
 
         testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
         server, smile, client = await self.connect_wrapper()
-        assert smile.smile_hostname == "smile000000"
+        assert smile.smile.hostname == "smile000000"
 
         self.validate_test_basics(
             _LOGGER,

From 80a42322be063312e32f168153fd91f6a901a7fd Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 11:40:50 +0200
Subject: [PATCH 17/32] Fix missing init

---
 plugwise/legacy/helper.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugwise/legacy/helper.py b/plugwise/legacy/helper.py
index 37cf3992d..586291629 100644
--- a/plugwise/legacy/helper.py
+++ b/plugwise/legacy/helper.py
@@ -73,6 +73,7 @@ def __init__(self) -> None:
         self._modules: etree.Element
         self._stretch_v2: bool
         self.gw_entities: dict[str, GwEntityData] = {}
+        self.smile: Munch = Munch()
         self.smile.mac_address: str | None
         self.smile.model: str
         self.smile.version: Version

From 58025de2f5adc12872a05579a6b82ba59d13f90f Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 11:42:11 +0200
Subject: [PATCH 18/32] Fix

---
 plugwise/data.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugwise/data.py b/plugwise/data.py
index 7553dc7b7..5fafb14ff 100644
--- a/plugwise/data.py
+++ b/plugwise/data.py
@@ -111,7 +111,7 @@ def _add_or_update_notifications(
         """Helper-function adding or updating the Plugwise notifications."""
         if (
             entity_id == self._gateway_id
-            and (self._is_thermostat or self.smile_type == "power")
+            and (self._is_thermostat or self.smile.type == "power")
         ) or (
             "binary_sensors" in entity
             and "plugwise_notification" in entity["binary_sensors"]

From c001f7d19cde8251fd49eb5f8e9b39b877accf08 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 11:43:36 +0200
Subject: [PATCH 19/32] Clean up unused imports

---
 plugwise/legacy/smile.py | 1 -
 plugwise/smile.py        | 1 -
 2 files changed, 2 deletions(-)

diff --git a/plugwise/legacy/smile.py b/plugwise/legacy/smile.py
index 68108163a..61f219521 100644
--- a/plugwise/legacy/smile.py
+++ b/plugwise/legacy/smile.py
@@ -27,7 +27,6 @@
 from plugwise.legacy.data import SmileLegacyData
 
 from munch import Munch
-from packaging.version import Version
 
 
 class SmileLegacyAPI(SmileLegacyData):
diff --git a/plugwise/smile.py b/plugwise/smile.py
index 1095b34f4..8cdb1546e 100644
--- a/plugwise/smile.py
+++ b/plugwise/smile.py
@@ -35,7 +35,6 @@
 
 # Dict as class
 from munch import Munch
-from packaging.version import Version
 
 
 class SmileAPI(SmileData):

From c7763be47db679c5c2b3d6ddf5cee9f397ce2f1a Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 11:49:04 +0200
Subject: [PATCH 20/32] Fix mypy issues

---
 plugwise/__init__.py      | 18 +++++++++---------
 plugwise/helper.py        |  5 -----
 plugwise/legacy/helper.py |  4 ----
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/plugwise/__init__.py b/plugwise/__init__.py
index 89923a94a..4b2c08d1c 100644
--- a/plugwise/__init__.py
+++ b/plugwise/__init__.py
@@ -74,16 +74,16 @@ def __init__(
         self._stretch_v2 = False
         self._target_smile: str = NONE
         self.smile: Munch = Munch()
-        self.smile.hostname: str = NONE
-        self.smile.hw_version: str | None = None
+        self.smile.hostname = NONE
+        self.smile.hw_version = None
         self.smile.legacy = False
-        self.smile.mac_address: str | None = None
-        self.smile.model: str = NONE
-        self.smile.model_id: str | None = None
-        self.smile.name: str = NONE
-        self.smile.type: str = NONE
-        self.smile.version: Version = Version("0.0.0")
-        self.smile.zigbee_mac_address: str | None = None
+        self.smile.mac_address = None
+        self.smile.model = NONE
+        self.smile.model_id = None
+        self.smile.name = NONE
+        self.smile.type = NONE
+        self.smile.version = Version("0.0.0")
+        self.smile.zigbee_mac_address = None
 
     @property
     def cooling_present(self) -> bool:
diff --git a/plugwise/helper.py b/plugwise/helper.py
index 774aa18ee..1b66af34b 100644
--- a/plugwise/helper.py
+++ b/plugwise/helper.py
@@ -86,11 +86,6 @@ def __init__(self) -> None:
         self._zones: dict[str, GwEntityData]
         self.gw_entities: dict[str, GwEntityData]
         self.smile: Munch = Munch()
-        self.smile.hw_version: str | None
-        self.smile.mac_address: str | None
-        self.smile.model: str
-        self.smile.model_id: str | None
-        self.smile.version: version.Version
 
     @property
     def gateway_id(self) -> str:
diff --git a/plugwise/legacy/helper.py b/plugwise/legacy/helper.py
index 586291629..729bfe9f5 100644
--- a/plugwise/legacy/helper.py
+++ b/plugwise/legacy/helper.py
@@ -74,10 +74,6 @@ def __init__(self) -> None:
         self._stretch_v2: bool
         self.gw_entities: dict[str, GwEntityData] = {}
         self.smile: Munch = Munch()
-        self.smile.mac_address: str | None
-        self.smile.model: str
-        self.smile.version: Version
-        self.smile.zigbee_mac_address: str | None
 
     @property
     def gateway_id(self) -> str:

From 0fbc753dbfe04cb6f439b55bdd1a08ce7957c7c2 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 11:49:46 +0200
Subject: [PATCH 21/32] Clean up

---
 plugwise/legacy/helper.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugwise/legacy/helper.py b/plugwise/legacy/helper.py
index 729bfe9f5..d975ac617 100644
--- a/plugwise/legacy/helper.py
+++ b/plugwise/legacy/helper.py
@@ -47,7 +47,6 @@
 # This way of importing aiohttp is because of patch/mocking in testing (aiohttp timeouts)
 from defusedxml import ElementTree as etree
 from munch import Munch
-from packaging.version import Version
 
 
 def etree_to_dict(element: etree.Element) -> dict[str, str]:

From 9ba61a9aa74335fd0e473bbc4b8d4d9d69d1a2d4 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 11:57:26 +0200
Subject: [PATCH 22/32] More mypy fixes

---
 plugwise/__init__.py | 8 ++++++--
 plugwise/common.py   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugwise/__init__.py b/plugwise/__init__.py
index 4b2c08d1c..47abbd837 100644
--- a/plugwise/__init__.py
+++ b/plugwise/__init__.py
@@ -5,6 +5,8 @@
 
 from __future__ import annotations
 
+from typing import cast
+
 from plugwise.constants import (
     DEFAULT_LEGACY_TIMEOUT,
     DEFAULT_PORT,
@@ -178,7 +180,7 @@ async def connect(self) -> Version:
         # Update all endpoints on first connect
         await self._smile_api.full_xml_update()
 
-        return self.smile.version
+        return cast(Version, self.smile.version)
 
     async def _smile_detect(
         self, result: etree.Element, dsmrmain: etree.Element
@@ -199,7 +201,9 @@ async def _smile_detect(
         else:
             model = await self._smile_detect_legacy(result, dsmrmain, model)
 
-        if model == "Unknown" or self.smile.version is None:  # pragma: no cover
+        if model == "Unknown" or self.smile.version == Version(
+            "0.0.0"
+        ):  # pragma: no cover
             # Corner case check
             LOGGER.error(
                 "Unable to find model or version information, please create"
diff --git a/plugwise/common.py b/plugwise/common.py
index be57505e1..933a2d6c2 100644
--- a/plugwise/common.py
+++ b/plugwise/common.py
@@ -64,7 +64,7 @@ def heater_id(self) -> str:
 
     def check_name(self, name: str) -> bool:
         """Helper-function checking the smile-name."""
-        return self.smile.name == name
+        return bool(self.smile.name == name)
 
     def _appl_heater_central_info(
         self,

From 7144a42c074871159e2577492526f673bbdb76fc Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 13:07:14 +0200
Subject: [PATCH 23/32] Improve argument name, sort arguments

---
 tests/test_init.py | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/test_init.py b/tests/test_init.py
index e7ce8314a..a6aac745f 100644
--- a/tests/test_init.py
+++ b/tests/test_init.py
@@ -92,10 +92,10 @@ async def load_testdata(
     def setup_app(
         self,
         broken=False,
-        timeout_happened=False,
-        raise_timeout=False,
         fail_auth=False,
+        raise_timeout=False,
         stretch=False,
+        timeout_happened=False,
     ):
         """Create mock webserver for Smile to interface with."""
         app = aiohttp.web.Application()
@@ -135,10 +135,10 @@ def setup_app(
     def setup_legacy_app(
         self,
         broken=False,
-        timeout_happened=False,
-        raise_timeout=False,
         fail_auth=False,
+        raise_timeout=False,
         stretch=False,
+        timeout_happened=False,
     ):
         """Create mock webserver for Smile to interface with."""
         app = aiohttp.web.Application()
@@ -264,7 +264,7 @@ async def smile_fail_auth(cls, request):
         raise aiohttp.web.HTTPUnauthorized()
 
     @staticmethod
-    def connect_status(broken, timeout_happened, fail_auth):
+    def connect_status(broken, fail_auth, timeout_happened):
         """Determine assumed status from settings."""
         assumed_status = 200
         if broken:
@@ -279,11 +279,11 @@ async def connect(
         self,
         function,
         broken=False,
-        timeout_happened=False,
-        raise_timeout=False,
-        real_timeout_value=10,
         fail_auth=False,
+        raise_timeout=False,
+        smile_timeout_value=10,
         stretch=False,
+        timeout_happened=False,
         url_part=CORE_DOMAIN_OBJECTS,
     ):
         """Connect to a smile environment and perform basic asserts."""
@@ -293,7 +293,7 @@ async def connect(
         )
 
         # Happy flow
-        app = function(broken, timeout_happened, raise_timeout, fail_auth, stretch)
+        app = function(broken, fail_auth, raise_timeout, stretch, timeout_happened)
 
         server = aiohttp.test_utils.TestServer(
             app, port=port, scheme="http", host="127.0.0.1"
@@ -308,7 +308,7 @@ async def connect(
         # Try/exceptpass to accommodate for Timeout of aoihttp
         try:
             resp = await websession.get(url)
-            assumed_status = self.connect_status(broken, timeout_happened, fail_auth)
+            assumed_status = self.connect_status(broken, fail_auth, timeout_happened)
             assert resp.status == assumed_status
             timeoutpass_result = False
             assert timeoutpass_result
@@ -351,7 +351,7 @@ async def connect(
         try:
             smile_version = await smile.connect()
             assert smile_version is not None
-            assert smile._timeout == real_timeout_value
+            assert smile._timeout == smile_timeout_value
             return server, smile, client
         except (
             pw_exceptions.ConnectionFailedError,
@@ -409,7 +409,7 @@ async def connect_legacy_wrapper(
             return await self.connect(
                 self.setup_legacy_app,
                 raise_timeout=True,
-                real_timeout_value=30,
+                smile_timeout_value=30,
                 url_part=CORE_LOCATIONS,
             )
 
@@ -417,7 +417,7 @@ async def connect_legacy_wrapper(
             _LOGGER.warning("Connecting to device exceeding timeout in response:")
             await self.connect(
                 self.setup_legacy_app,
-                real_timeout_value=30,
+                smile_timeout_value=30,
                 timeout_happened=True,
                 url_part=CORE_LOCATIONS,
             )
@@ -431,7 +431,7 @@ async def connect_legacy_wrapper(
             await self.connect(
                 self.setup_legacy_app,
                 broken=True,
-                real_timeout_value=30,
+                smile_timeout_value=30,
                 url_part=CORE_LOCATIONS,
             )
             _LOGGER.error(" - broken information not handled")  # pragma: no cover
@@ -442,7 +442,7 @@ async def connect_legacy_wrapper(
         _LOGGER.info("Connecting to functioning device:")
         return await self.connect(
             self.setup_legacy_app,
-            real_timeout_value=30,
+            smile_timeout_value=30,
             stretch=stretch,
             url_part=CORE_LOCATIONS,
         )

From c95b88d05b31b4d39854810880fc92ec14f5da8a Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 13:38:23 +0200
Subject: [PATCH 24/32] Update CHANGELOG

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5df40835..2b101fa22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Ongoing
 
-- Implement async file-open in tests
+- Implement code quality improvements as suggested by SonarCloud
 
 ## v1.7.6
 

From 5bdb3dc1a227093146cb773db05571d3f9ce89a8 Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 14:32:34 +0200
Subject: [PATCH 25/32] Reduce complexity of set_switch_state()

---
 plugwise/smile.py | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/plugwise/smile.py b/plugwise/smile.py
index 8cdb1546e..df8c92486 100644
--- a/plugwise/smile.py
+++ b/plugwise/smile.py
@@ -37,6 +37,27 @@
 from munch import Munch
 
 
+def model_to_switch_items(model: str, state: str, switch: Munch) -> tuple[str, Munch]:
+    """Translate state and switch attributes based on model name.
+
+    Helper function for set_switch_state().
+    """
+    match model:
+        case "dhw_cm_switch":
+            switch.device = "toggle"
+            switch.func_type = "toggle_functionality"
+            switch.act_type = "domestic_hot_water_comfort_mode"
+        case "cooling_ena_switch":
+            switch.device = "toggle"
+            switch.func_type = "toggle_functionality"
+            switch.act_type = "cooling_enabled"
+        case "lock":
+            switch.func = "lock"
+            state = "true" if state == STATE_ON else "false"
+
+    return (state, switch)
+
+
 class SmileAPI(SmileData):
     """The Plugwise SmileAPI helper class for actual Plugwise devices."""
 
@@ -381,20 +402,7 @@ async def set_switch_state(
         switch.device = "relay"
         switch.func_type = "relay_functionality"
         switch.func = "state"
-        if model == "dhw_cm_switch":
-            switch.device = "toggle"
-            switch.func_type = "toggle_functionality"
-            switch.act_type = "domestic_hot_water_comfort_mode"
-
-        if model == "cooling_ena_switch":
-            switch.device = "toggle"
-            switch.func_type = "toggle_functionality"
-            switch.act_type = "cooling_enabled"
-
-        if model == "lock":
-            switch.func = "lock"
-            state = "true" if state == STATE_ON else "false"
-
+        (state, switch) = model_to_switch_items(model, state, switch)
         data = (
             f"<{switch.func_type}>"
             f"<{switch.func}>{state}</{switch.func}>"

From 4b4775986b150cb6b17fb4d664446a2dbae1f8fc Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 14:48:12 +0200
Subject: [PATCH 26/32] Reduce complexity of legacy -helper _all_appliances()

---
 plugwise/legacy/helper.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugwise/legacy/helper.py b/plugwise/legacy/helper.py
index d975ac617..4b7e42cbe 100644
--- a/plugwise/legacy/helper.py
+++ b/plugwise/legacy/helper.py
@@ -136,8 +136,10 @@ def _all_appliances(self) -> None:
                 continue  # pragma: no cover
 
             self._create_gw_entities(appl)
+            self._reorder_devices()
 
-        # Place the gateway and optional heater_central devices as 1st and 2nd
+    def _reorder_devices(self) -> None:
+        """Place the gateway and optional heater_central devices as 1st and 2nd."""
         for dev_class in PRIORITY_DEVICE_CLASSES:
             for entity_id, entity in dict(self.gw_entities).items():
                 if entity["dev_class"] == dev_class:

From bbf3161c1e9e31732ff4b7f7c7fea20fe59b352f Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 14:53:10 +0200
Subject: [PATCH 27/32] Remove unneeded brackets

---
 plugwise/smile.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugwise/smile.py b/plugwise/smile.py
index df8c92486..970181ca1 100644
--- a/plugwise/smile.py
+++ b/plugwise/smile.py
@@ -55,7 +55,7 @@ def model_to_switch_items(model: str, state: str, switch: Munch) -> tuple[str, M
             switch.func = "lock"
             state = "true" if state == STATE_ON else "false"
 
-    return (state, switch)
+    return state, switch
 
 
 class SmileAPI(SmileData):
@@ -402,7 +402,7 @@ async def set_switch_state(
         switch.device = "relay"
         switch.func_type = "relay_functionality"
         switch.func = "state"
-        (state, switch) = model_to_switch_items(model, state, switch)
+        state, switch = model_to_switch_items(model, state, switch)
         data = (
             f"<{switch.func_type}>"
             f"<{switch.func}>{state}</{switch.func}>"

From d98771736b9e79439fb9c9aedbd9516919a7a56a Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 14:58:20 +0200
Subject: [PATCH 28/32] Implement improvement suggestion

---
 plugwise/legacy/helper.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/plugwise/legacy/helper.py b/plugwise/legacy/helper.py
index 4b7e42cbe..9fcf6d88e 100644
--- a/plugwise/legacy/helper.py
+++ b/plugwise/legacy/helper.py
@@ -139,16 +139,14 @@ def _all_appliances(self) -> None:
             self._reorder_devices()
 
     def _reorder_devices(self) -> None:
-        """Place the gateway and optional heater_central devices as 1st and 2nd."""
+       """Place the gateway and optional heater_central devices as 1st and 2nd."""
+        reordered = {}
         for dev_class in PRIORITY_DEVICE_CLASSES:
             for entity_id, entity in dict(self.gw_entities).items():
                 if entity["dev_class"] == dev_class:
-                    tmp_entity = entity
-                    self.gw_entities.pop(entity_id)
-                    cleared_dict = self.gw_entities
-                    add_to_front = {entity_id: tmp_entity}
-                    self.gw_entities = {**add_to_front, **cleared_dict}
+                    reordered[entity_id] = self.gw_entities.pop(entity_id)
                     break
+        self.gw_entities = {**reordered, **self.gw_entities}
 
     def _all_locations(self) -> None:
         """Collect all locations."""

From c4fab1738727c3e18aec6b4e0a0273eede7f9dec Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 15:04:39 +0200
Subject: [PATCH 29/32] Bump version to v1.7.7, update CHANGELOG

---
 CHANGELOG.md              | 4 ++--
 plugwise/legacy/helper.py | 2 +-
 pyproject.toml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b101fa22..858855752 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
 # Changelog
 
-## Ongoing
+## v1.7.7
 
-- Implement code quality improvements as suggested by SonarCloud
+- Implement code quality improvements as suggested by SonarCloud via [#762](https://github.com/plugwise/python-plugwise/pull/762), [#763](https://github.com/plugwise/python-plugwise/pull/763), [#764](https://github.com/plugwise/python-plugwise/pull/764), and [#765](https://github.com/plugwise/python-plugwise/pull/765)
 
 ## v1.7.6
 
diff --git a/plugwise/legacy/helper.py b/plugwise/legacy/helper.py
index 9fcf6d88e..922663a28 100644
--- a/plugwise/legacy/helper.py
+++ b/plugwise/legacy/helper.py
@@ -139,7 +139,7 @@ def _all_appliances(self) -> None:
             self._reorder_devices()
 
     def _reorder_devices(self) -> None:
-       """Place the gateway and optional heater_central devices as 1st and 2nd."""
+        """Place the gateway and optional heater_central devices as 1st and 2nd."""
         reordered = {}
         for dev_class in PRIORITY_DEVICE_CLASSES:
             for entity_id, entity in dict(self.gw_entities).items():
diff --git a/pyproject.toml b/pyproject.toml
index ef4299677..4fc91a160 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise"
-version         = "1.7.6"
+version         = "1.7.7"
 license         = "MIT"
 description     = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3."
 readme          = "README.md"

From abde45864e4441a277a73bc953a0b423fd02f84e Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 15:14:15 +0200
Subject: [PATCH 30/32] Move _reorder_devices() to common.py

---
 fixtures/adam_heatpump_cooling/data.json      | 126 +++++++++++++++---
 fixtures/adam_jip/data.json                   |  77 +++++++++--
 .../adam_multiple_devices_per_zone/data.json  |  68 ++++++++--
 .../data.json                                 |  18 ++-
 fixtures/adam_plus_anna/data.json             |  17 ++-
 fixtures/adam_plus_anna_new/data.json         |  41 +++++-
 .../data.json                                 |  41 +++++-
 fixtures/adam_zone_per_device/data.json       |  76 +++++++++--
 fixtures/anna_heatpump_cooling/data.json      |  13 +-
 .../data.json                                 |  13 +-
 fixtures/anna_heatpump_heating/data.json      |  13 +-
 fixtures/anna_v4/data.json                    |  14 +-
 fixtures/anna_v4_dhw/data.json                |  14 +-
 fixtures/anna_v4_no_tag/data.json             |  14 +-
 fixtures/anna_without_boiler_fw441/data.json  |  14 +-
 plugwise/common.py                            |  11 ++
 plugwise/legacy/helper.py                     |  11 --
 17 files changed, 475 insertions(+), 106 deletions(-)

diff --git a/fixtures/adam_heatpump_cooling/data.json b/fixtures/adam_heatpump_cooling/data.json
index 04b033f2a..9999ea242 100644
--- a/fixtures/adam_heatpump_cooling/data.json
+++ b/fixtures/adam_heatpump_cooling/data.json
@@ -12,7 +12,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Slaapkamer SJ",
-    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
+    "preset_modes": [
+      "no_frost",
+      "vacation",
+      "away",
+      "home",
+      "asleep"
+    ],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -26,7 +32,9 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": ["d3a276aeb3114a509bab1e4bf8c40348"],
+      "primary": [
+        "d3a276aeb3114a509bab1e4bf8c40348"
+      ],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -130,7 +138,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Slaapkamer DB",
-    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
+    "preset_modes": [
+      "no_frost",
+      "vacation",
+      "away",
+      "home",
+      "asleep"
+    ],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -144,7 +158,9 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": ["47e2c550a33846b680725aa3fb229473"],
+      "primary": [
+        "47e2c550a33846b680725aa3fb229473"
+      ],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -244,7 +260,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Badkamer 2",
-    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
+    "preset_modes": [
+      "no_frost",
+      "vacation",
+      "away",
+      "home",
+      "asleep"
+    ],
     "select_schedule": "Werkdag schema",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -257,7 +279,9 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": ["f04c985c11ad4848b8fcd710343f9dcf"],
+      "primary": [
+        "f04c985c11ad4848b8fcd710343f9dcf"
+      ],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -288,7 +312,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",
@@ -386,7 +414,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Badkamer 1",
-    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
+    "preset_modes": [
+      "no_frost",
+      "vacation",
+      "away",
+      "home",
+      "asleep"
+    ],
     "select_schedule": "Werkdag schema",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -400,7 +434,9 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": ["eac5db95d97241f6b17790897847ccf5"],
+      "primary": [
+        "eac5db95d97241f6b17790897847ccf5"
+      ],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -418,7 +454,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Slaapkamer RB",
-    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
+    "preset_modes": [
+      "no_frost",
+      "vacation",
+      "away",
+      "home",
+      "asleep"
+    ],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 3.13,
@@ -431,7 +473,9 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": ["c4ed311d54e341f58b4cdd201d1fde7e"],
+      "primary": [
+        "c4ed311d54e341f58b4cdd201d1fde7e"
+      ],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -469,7 +513,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Slaapkamer SQ",
-    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
+    "preset_modes": [
+      "no_frost",
+      "vacation",
+      "away",
+      "home",
+      "asleep"
+    ],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -483,7 +533,9 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": ["beb32da072274e698146db8b022f3c36"],
+      "primary": [
+        "beb32da072274e698146db8b022f3c36"
+      ],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -521,7 +573,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Keuken",
-    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
+    "preset_modes": [
+      "no_frost",
+      "vacation",
+      "away",
+      "home",
+      "asleep"
+    ],
     "select_schedule": "Werkdag schema",
     "sensors": {
       "electricity_consumed": 2.13,
@@ -535,7 +593,9 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": ["ea8372c0e3ad4622ad45a041d02425f5"],
+      "primary": [
+        "ea8372c0e3ad4622ad45a041d02425f5"
+      ],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -553,7 +613,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Bijkeuken",
-    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
+    "preset_modes": [
+      "no_frost",
+      "vacation",
+      "away",
+      "home",
+      "asleep"
+    ],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -567,7 +633,9 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": ["1053c8bbf8be43c6921742b146a625f1"],
+      "primary": [
+        "1053c8bbf8be43c6921742b146a625f1"
+      ],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -683,7 +751,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Slaapkamer JM",
-    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
+    "preset_modes": [
+      "no_frost",
+      "vacation",
+      "away",
+      "home",
+      "asleep"
+    ],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -697,7 +771,9 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": ["7fda9f84f01342f8afe9ebbbbff30c0f"],
+      "primary": [
+        "7fda9f84f01342f8afe9ebbbbff30c0f"
+      ],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -785,7 +861,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Woonkamer",
-    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
+    "preset_modes": [
+      "no_frost",
+      "vacation",
+      "away",
+      "home",
+      "asleep"
+    ],
     "select_schedule": "Werkdag schema",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -799,7 +881,9 @@
       "upper_bound": 35.0
     },
     "thermostats": {
-      "primary": ["ca79d23ae0094120b877558734cff85c"],
+      "primary": [
+        "ca79d23ae0094120b877558734cff85c"
+      ],
       "secondary": []
     },
     "vendor": "Plugwise"
diff --git a/fixtures/adam_jip/data.json b/fixtures/adam_jip/data.json
index ba23d9418..5e72ad345 100644
--- a/fixtures/adam_jip/data.json
+++ b/fixtures/adam_jip/data.json
@@ -6,7 +6,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Slaapkamer",
-    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "preset_modes": [
+      "home",
+      "asleep",
+      "away",
+      "vacation",
+      "no_frost"
+    ],
     "sensors": {
       "temperature": 24.2
     },
@@ -17,8 +23,12 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": ["1346fbd8498d4dbcab7e18d51b771f3d"],
-      "secondary": ["356b65335e274d769c338223e7af9c33"]
+      "primary": [
+        "1346fbd8498d4dbcab7e18d51b771f3d"
+      ],
+      "secondary": [
+        "356b65335e274d769c338223e7af9c33"
+      ]
     },
     "vendor": "Plugwise"
   },
@@ -29,7 +39,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Woonkamer",
-    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "preset_modes": [
+      "home",
+      "asleep",
+      "away",
+      "vacation",
+      "no_frost"
+    ],
     "sensors": {
       "temperature": 27.4
     },
@@ -40,8 +56,12 @@
       "upper_bound": 30.0
     },
     "thermostats": {
-      "primary": ["f61f1a2535f54f52ad006a3d18e459ca"],
-      "secondary": ["833de10f269c4deab58fb9df69901b4e"]
+      "primary": [
+        "f61f1a2535f54f52ad006a3d18e459ca"
+      ],
+      "secondary": [
+        "833de10f269c4deab58fb9df69901b4e"
+      ]
     },
     "vendor": "Plugwise"
   },
@@ -218,7 +238,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": "9e4433a9d69f40b3aefd15e74395eaec",
     "mac_address": "012345670001",
@@ -226,7 +250,12 @@
     "model_id": "smile_open_therm",
     "name": "Adam",
     "notifications": {},
-    "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": {
@@ -242,7 +271,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Kinderkamer",
-    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "preset_modes": [
+      "home",
+      "asleep",
+      "away",
+      "vacation",
+      "no_frost"
+    ],
     "sensors": {
       "temperature": 30.0
     },
@@ -253,8 +288,12 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": ["6f3e9d7084214c21b9dfa46f6eeb8700"],
-      "secondary": ["d4496250d0e942cfa7aea3476e9070d5"]
+      "primary": [
+        "6f3e9d7084214c21b9dfa46f6eeb8700"
+      ],
+      "secondary": [
+        "d4496250d0e942cfa7aea3476e9070d5"
+      ]
     },
     "vendor": "Plugwise"
   },
@@ -289,7 +328,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Logeerkamer",
-    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "preset_modes": [
+      "home",
+      "asleep",
+      "away",
+      "vacation",
+      "no_frost"
+    ],
     "sensors": {
       "temperature": 30.0
     },
@@ -300,8 +345,12 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": ["a6abc6a129ee499c88a4d420cc413b47"],
-      "secondary": ["1da4d325838e4ad8aac12177214505c9"]
+      "primary": [
+        "a6abc6a129ee499c88a4d420cc413b47"
+      ],
+      "secondary": [
+        "1da4d325838e4ad8aac12177214505c9"
+      ]
     },
     "vendor": "Plugwise"
   },
diff --git a/fixtures/adam_multiple_devices_per_zone/data.json b/fixtures/adam_multiple_devices_per_zone/data.json
index 8937cd465..84dd7ce7b 100644
--- a/fixtures/adam_multiple_devices_per_zone/data.json
+++ b/fixtures/adam_multiple_devices_per_zone/data.json
@@ -35,7 +35,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Badkamer",
-    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "preset_modes": [
+      "home",
+      "asleep",
+      "away",
+      "vacation",
+      "no_frost"
+    ],
     "select_schedule": "Badkamer Schema",
     "sensors": {
       "temperature": 18.9
@@ -70,7 +76,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Bios",
-    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "preset_modes": [
+      "home",
+      "asleep",
+      "away",
+      "vacation",
+      "no_frost"
+    ],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -84,8 +96,12 @@
       "upper_bound": 100.0
     },
     "thermostats": {
-      "primary": ["df4a4a8169904cdb9c03d61a21f42140"],
-      "secondary": ["a2c3583e0a6349358998b760cea82d2a"]
+      "primary": [
+        "df4a4a8169904cdb9c03d61a21f42140"
+      ],
+      "secondary": [
+        "a2c3583e0a6349358998b760cea82d2a"
+      ]
     },
     "vendor": "Plugwise"
   },
@@ -125,7 +141,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Garage",
-    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "preset_modes": [
+      "home",
+      "asleep",
+      "away",
+      "vacation",
+      "no_frost"
+    ],
     "select_schedule": "off",
     "sensors": {
       "temperature": 15.6
@@ -137,7 +159,9 @@
       "upper_bound": 100.0
     },
     "thermostats": {
-      "primary": ["e7693eb9582644e5b865dba8d4447cf1"],
+      "primary": [
+        "e7693eb9582644e5b865dba8d4447cf1"
+      ],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -273,7 +297,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Jessie",
-    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "preset_modes": [
+      "home",
+      "asleep",
+      "away",
+      "vacation",
+      "no_frost"
+    ],
     "select_schedule": "CV Jessie",
     "sensors": {
       "temperature": 17.2
@@ -285,8 +315,12 @@
       "upper_bound": 100.0
     },
     "thermostats": {
-      "primary": ["6a3bf693d05e48e0b460c815a4fdd09d"],
-      "secondary": ["d3da73bde12a47d5a6b8f9dad971f2ec"]
+      "primary": [
+        "6a3bf693d05e48e0b460c815a4fdd09d"
+      ],
+      "secondary": [
+        "d3da73bde12a47d5a6b8f9dad971f2ec"
+      ]
     },
     "vendor": "Plugwise"
   },
@@ -418,7 +452,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Woonkamer",
-    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "preset_modes": [
+      "home",
+      "asleep",
+      "away",
+      "vacation",
+      "no_frost"
+    ],
     "select_schedule": "GF7  Woonkamer",
     "sensors": {
       "electricity_consumed": 35.6,
@@ -432,8 +472,12 @@
       "upper_bound": 100.0
     },
     "thermostats": {
-      "primary": ["b59bcebaf94b499ea7d46e4a66fb62d8"],
-      "secondary": ["b310b72a0e354bfab43089919b9a88bf"]
+      "primary": [
+        "b59bcebaf94b499ea7d46e4a66fb62d8"
+      ],
+      "secondary": [
+        "b310b72a0e354bfab43089919b9a88bf"
+      ]
     },
     "vendor": "Plugwise"
   },
diff --git a/fixtures/adam_onoff_cooling_fake_firmware/data.json b/fixtures/adam_onoff_cooling_fake_firmware/data.json
index 4803aad72..a356c6aa9 100644
--- a/fixtures/adam_onoff_cooling_fake_firmware/data.json
+++ b/fixtures/adam_onoff_cooling_fake_firmware/data.json
@@ -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",
@@ -90,7 +94,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Woonkamer",
-    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
+    "preset_modes": [
+      "no_frost",
+      "vacation",
+      "away",
+      "home",
+      "asleep"
+    ],
     "select_schedule": "Werkdag schema",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -104,7 +114,9 @@
       "upper_bound": 35.0
     },
     "thermostats": {
-      "primary": ["ca79d23ae0094120b877558734cff85c"],
+      "primary": [
+        "ca79d23ae0094120b877558734cff85c"
+      ],
       "secondary": []
     },
     "vendor": "Plugwise"
diff --git a/fixtures/adam_plus_anna/data.json b/fixtures/adam_plus_anna/data.json
index fd25947a0..108b84c5f 100644
--- a/fixtures/adam_plus_anna/data.json
+++ b/fixtures/adam_plus_anna/data.json
@@ -1,13 +1,22 @@
 {
   "009490cc2f674ce6b576863fbb64f867": {
     "active_preset": "home",
-    "available_schedules": ["Weekschema", "off"],
+    "available_schedules": [
+      "Weekschema",
+      "off"
+    ],
     "climate_mode": "auto",
     "control_state": "idle",
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Living room",
-    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "preset_modes": [
+      "home",
+      "asleep",
+      "away",
+      "vacation",
+      "no_frost"
+    ],
     "select_schedule": "Weekschema",
     "sensors": {
       "electricity_consumed": 74.2,
@@ -21,7 +30,9 @@
       "upper_bound": 35.0
     },
     "thermostats": {
-      "primary": ["ee62cad889f94e8ca3d09021f03a660b"],
+      "primary": [
+        "ee62cad889f94e8ca3d09021f03a660b"
+      ],
       "secondary": []
     },
     "vendor": "Plugwise"
diff --git a/fixtures/adam_plus_anna_new/data.json b/fixtures/adam_plus_anna_new/data.json
index fd87b10ab..b98126e3a 100644
--- a/fixtures/adam_plus_anna_new/data.json
+++ b/fixtures/adam_plus_anna_new/data.json
@@ -161,7 +161,11 @@
     },
     "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",
@@ -169,7 +173,12 @@
     "model_id": "smile_open_therm",
     "name": "Adam",
     "notifications": {},
-    "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": {
@@ -231,7 +240,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Living room",
-    "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
+    "preset_modes": [
+      "no_frost",
+      "asleep",
+      "vacation",
+      "home",
+      "away"
+    ],
     "select_schedule": "Weekschema",
     "sensors": {
       "electricity_consumed": 149.9,
@@ -245,7 +260,9 @@
       "upper_bound": 35.0
     },
     "thermostats": {
-      "primary": ["ad4838d7d35c4d6ea796ee12ae5aedf8"],
+      "primary": [
+        "ad4838d7d35c4d6ea796ee12ae5aedf8"
+      ],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -264,7 +281,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Bathroom",
-    "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
+    "preset_modes": [
+      "no_frost",
+      "asleep",
+      "vacation",
+      "home",
+      "away"
+    ],
     "select_schedule": "Badkamer",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -278,8 +301,12 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
-      "secondary": ["1772a4ea304041adb83f357b751341ff"]
+      "primary": [
+        "e2f4322d57924fa090fbbc48b3a140dc"
+      ],
+      "secondary": [
+        "1772a4ea304041adb83f357b751341ff"
+      ]
     },
     "vendor": "Plugwise"
   }
diff --git a/fixtures/adam_plus_anna_new_regulation_off/data.json b/fixtures/adam_plus_anna_new_regulation_off/data.json
index 93710a1fa..e95fe8311 100644
--- a/fixtures/adam_plus_anna_new_regulation_off/data.json
+++ b/fixtures/adam_plus_anna_new_regulation_off/data.json
@@ -161,7 +161,11 @@
     },
     "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",
@@ -169,7 +173,12 @@
     "model_id": "smile_open_therm",
     "name": "Adam",
     "notifications": {},
-    "regulation_modes": ["bleeding_hot", "bleeding_cold", "off", "heating"],
+    "regulation_modes": [
+      "bleeding_hot",
+      "bleeding_cold",
+      "off",
+      "heating"
+    ],
     "select_gateway_mode": "full",
     "select_regulation_mode": "off",
     "sensors": {
@@ -231,7 +240,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Living room",
-    "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
+    "preset_modes": [
+      "no_frost",
+      "asleep",
+      "vacation",
+      "home",
+      "away"
+    ],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 149.9,
@@ -245,7 +260,9 @@
       "upper_bound": 35.0
     },
     "thermostats": {
-      "primary": ["ad4838d7d35c4d6ea796ee12ae5aedf8"],
+      "primary": [
+        "ad4838d7d35c4d6ea796ee12ae5aedf8"
+      ],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -264,7 +281,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Bathroom",
-    "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
+    "preset_modes": [
+      "no_frost",
+      "asleep",
+      "vacation",
+      "home",
+      "away"
+    ],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -278,8 +301,12 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
-      "secondary": ["1772a4ea304041adb83f357b751341ff"]
+      "primary": [
+        "e2f4322d57924fa090fbbc48b3a140dc"
+      ],
+      "secondary": [
+        "1772a4ea304041adb83f357b751341ff"
+      ]
     },
     "vendor": "Plugwise"
   }
diff --git a/fixtures/adam_zone_per_device/data.json b/fixtures/adam_zone_per_device/data.json
index b53a5c357..57a94c9b5 100644
--- a/fixtures/adam_zone_per_device/data.json
+++ b/fixtures/adam_zone_per_device/data.json
@@ -35,7 +35,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Badkamer",
-    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "preset_modes": [
+      "home",
+      "asleep",
+      "away",
+      "vacation",
+      "no_frost"
+    ],
     "select_schedule": "Badkamer Schema",
     "sensors": {
       "temperature": 18.8
@@ -47,8 +53,12 @@
       "upper_bound": 100.0
     },
     "thermostats": {
-      "primary": ["f1fee6043d3642a9b0a65297455f008e"],
-      "secondary": ["680423ff840043738f42cc7f1ff97a36"]
+      "primary": [
+        "f1fee6043d3642a9b0a65297455f008e"
+      ],
+      "secondary": [
+        "680423ff840043738f42cc7f1ff97a36"
+      ]
     },
     "vendor": "Plugwise"
   },
@@ -67,7 +77,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Bios",
-    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "preset_modes": [
+      "home",
+      "asleep",
+      "away",
+      "vacation",
+      "no_frost"
+    ],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -81,8 +97,12 @@
       "upper_bound": 100.0
     },
     "thermostats": {
-      "primary": ["df4a4a8169904cdb9c03d61a21f42140"],
-      "secondary": ["a2c3583e0a6349358998b760cea82d2a"]
+      "primary": [
+        "df4a4a8169904cdb9c03d61a21f42140"
+      ],
+      "secondary": [
+        "a2c3583e0a6349358998b760cea82d2a"
+      ]
     },
     "vendor": "Plugwise"
   },
@@ -122,7 +142,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Garage",
-    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "preset_modes": [
+      "home",
+      "asleep",
+      "away",
+      "vacation",
+      "no_frost"
+    ],
     "select_schedule": "off",
     "sensors": {
       "temperature": 15.6
@@ -134,7 +160,9 @@
       "upper_bound": 100.0
     },
     "thermostats": {
-      "primary": ["e7693eb9582644e5b865dba8d4447cf1"],
+      "primary": [
+        "e7693eb9582644e5b865dba8d4447cf1"
+      ],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -270,7 +298,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Jessie",
-    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "preset_modes": [
+      "home",
+      "asleep",
+      "away",
+      "vacation",
+      "no_frost"
+    ],
     "select_schedule": "CV Jessie",
     "sensors": {
       "temperature": 17.1
@@ -282,8 +316,12 @@
       "upper_bound": 100.0
     },
     "thermostats": {
-      "primary": ["6a3bf693d05e48e0b460c815a4fdd09d"],
-      "secondary": ["d3da73bde12a47d5a6b8f9dad971f2ec"]
+      "primary": [
+        "6a3bf693d05e48e0b460c815a4fdd09d"
+      ],
+      "secondary": [
+        "d3da73bde12a47d5a6b8f9dad971f2ec"
+      ]
     },
     "vendor": "Plugwise"
   },
@@ -415,7 +453,13 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Woonkamer",
-    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
+    "preset_modes": [
+      "home",
+      "asleep",
+      "away",
+      "vacation",
+      "no_frost"
+    ],
     "select_schedule": "GF7  Woonkamer",
     "sensors": {
       "electricity_consumed": 35.8,
@@ -429,8 +473,12 @@
       "upper_bound": 100.0
     },
     "thermostats": {
-      "primary": ["b59bcebaf94b499ea7d46e4a66fb62d8"],
-      "secondary": ["b310b72a0e354bfab43089919b9a88bf"]
+      "primary": [
+        "b59bcebaf94b499ea7d46e4a66fb62d8"
+      ],
+      "secondary": [
+        "b310b72a0e354bfab43089919b9a88bf"
+      ]
     },
     "vendor": "Plugwise"
   },
diff --git a/fixtures/anna_heatpump_cooling/data.json b/fixtures/anna_heatpump_cooling/data.json
index c722045a2..f1bdd86fe 100644
--- a/fixtures/anna_heatpump_cooling/data.json
+++ b/fixtures/anna_heatpump_cooling/data.json
@@ -55,7 +55,10 @@
   },
   "3cb70739631c4d17a86b8b12e8a5161b": {
     "active_preset": "home",
-    "available_schedules": ["standaard", "off"],
+    "available_schedules": [
+      "standaard",
+      "off"
+    ],
     "climate_mode": "heat_cool",
     "control_state": "cooling",
     "dev_class": "thermostat",
@@ -64,7 +67,13 @@
     "location": "c784ee9fdab44e1395b8dee7d7a497d5",
     "model": "ThermoTouch",
     "name": "Anna",
-    "preset_modes": ["no_frost", "home", "away", "asleep", "vacation"],
+    "preset_modes": [
+      "no_frost",
+      "home",
+      "away",
+      "asleep",
+      "vacation"
+    ],
     "select_schedule": "off",
     "sensors": {
       "cooling_activation_outdoor_temperature": 21.0,
diff --git a/fixtures/anna_heatpump_cooling_fake_firmware/data.json b/fixtures/anna_heatpump_cooling_fake_firmware/data.json
index 4218240cb..f08a11bba 100644
--- a/fixtures/anna_heatpump_cooling_fake_firmware/data.json
+++ b/fixtures/anna_heatpump_cooling_fake_firmware/data.json
@@ -55,7 +55,10 @@
   },
   "3cb70739631c4d17a86b8b12e8a5161b": {
     "active_preset": "home",
-    "available_schedules": ["standaard", "off"],
+    "available_schedules": [
+      "standaard",
+      "off"
+    ],
     "climate_mode": "heat_cool",
     "control_state": "cooling",
     "dev_class": "thermostat",
@@ -64,7 +67,13 @@
     "location": "c784ee9fdab44e1395b8dee7d7a497d5",
     "model": "ThermoTouch",
     "name": "Anna",
-    "preset_modes": ["no_frost", "home", "away", "asleep", "vacation"],
+    "preset_modes": [
+      "no_frost",
+      "home",
+      "away",
+      "asleep",
+      "vacation"
+    ],
     "select_schedule": "off",
     "sensors": {
       "cooling_activation_outdoor_temperature": 21.0,
diff --git a/fixtures/anna_heatpump_heating/data.json b/fixtures/anna_heatpump_heating/data.json
index ab6bdf08e..2d90b6f12 100644
--- a/fixtures/anna_heatpump_heating/data.json
+++ b/fixtures/anna_heatpump_heating/data.json
@@ -60,7 +60,10 @@
   },
   "3cb70739631c4d17a86b8b12e8a5161b": {
     "active_preset": "home",
-    "available_schedules": ["standaard", "off"],
+    "available_schedules": [
+      "standaard",
+      "off"
+    ],
     "climate_mode": "auto",
     "control_state": "heating",
     "dev_class": "thermostat",
@@ -69,7 +72,13 @@
     "location": "c784ee9fdab44e1395b8dee7d7a497d5",
     "model": "ThermoTouch",
     "name": "Anna",
-    "preset_modes": ["no_frost", "home", "away", "asleep", "vacation"],
+    "preset_modes": [
+      "no_frost",
+      "home",
+      "away",
+      "asleep",
+      "vacation"
+    ],
     "select_schedule": "standaard",
     "sensors": {
       "cooling_activation_outdoor_temperature": 21.0,
diff --git a/fixtures/anna_v4/data.json b/fixtures/anna_v4/data.json
index 7e6f138be..a64605171 100644
--- a/fixtures/anna_v4/data.json
+++ b/fixtures/anna_v4/data.json
@@ -1,7 +1,11 @@
 {
   "01b85360fdd243d0aaad4d6ac2a5ba7e": {
     "active_preset": "home",
-    "available_schedules": ["Standaard", "Thuiswerken", "off"],
+    "available_schedules": [
+      "Standaard",
+      "Thuiswerken",
+      "off"
+    ],
     "climate_mode": "heat",
     "control_state": "heating",
     "dev_class": "thermostat",
@@ -10,7 +14,13 @@
     "location": "eb5309212bf5407bb143e5bfa3b18aee",
     "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/data.json b/fixtures/anna_v4_dhw/data.json
index a560de161..677d0a622 100644
--- a/fixtures/anna_v4_dhw/data.json
+++ b/fixtures/anna_v4_dhw/data.json
@@ -1,7 +1,11 @@
 {
   "01b85360fdd243d0aaad4d6ac2a5ba7e": {
     "active_preset": "home",
-    "available_schedules": ["Standaard", "Thuiswerken", "off"],
+    "available_schedules": [
+      "Standaard",
+      "Thuiswerken",
+      "off"
+    ],
     "climate_mode": "heat",
     "control_state": "idle",
     "dev_class": "thermostat",
@@ -10,7 +14,13 @@
     "location": "eb5309212bf5407bb143e5bfa3b18aee",
     "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_no_tag/data.json b/fixtures/anna_v4_no_tag/data.json
index 513e7ce20..926b858e2 100644
--- a/fixtures/anna_v4_no_tag/data.json
+++ b/fixtures/anna_v4_no_tag/data.json
@@ -1,7 +1,11 @@
 {
   "01b85360fdd243d0aaad4d6ac2a5ba7e": {
     "active_preset": "home",
-    "available_schedules": ["Standaard", "Thuiswerken", "off"],
+    "available_schedules": [
+      "Standaard",
+      "Thuiswerken",
+      "off"
+    ],
     "climate_mode": "auto",
     "control_state": "heating",
     "dev_class": "thermostat",
@@ -10,7 +14,13 @@
     "location": "eb5309212bf5407bb143e5bfa3b18aee",
     "model": "ThermoTouch",
     "name": "Anna",
-    "preset_modes": ["vacation", "no_frost", "away", "asleep", "home"],
+    "preset_modes": [
+      "vacation",
+      "no_frost",
+      "away",
+      "asleep",
+      "home"
+    ],
     "select_schedule": "Thuiswerken",
     "sensors": {
       "illuminance": 60.0,
diff --git a/fixtures/anna_without_boiler_fw441/data.json b/fixtures/anna_without_boiler_fw441/data.json
index 7e0b7cc4f..7cc9eaff3 100644
--- a/fixtures/anna_without_boiler_fw441/data.json
+++ b/fixtures/anna_without_boiler_fw441/data.json
@@ -1,7 +1,11 @@
 {
   "7ffbb3ab4b6c4ab2915d7510f7bf8fe9": {
     "active_preset": "home",
-    "available_schedules": ["Test", "Normaal", "off"],
+    "available_schedules": [
+      "Test",
+      "Normaal",
+      "off"
+    ],
     "climate_mode": "auto",
     "control_state": "idle",
     "dev_class": "thermostat",
@@ -10,7 +14,13 @@
     "location": "c34c6864216446528e95d88985e714cc",
     "model": "ThermoTouch",
     "name": "Anna",
-    "preset_modes": ["no_frost", "asleep", "away", "vacation", "home"],
+    "preset_modes": [
+      "no_frost",
+      "asleep",
+      "away",
+      "vacation",
+      "home"
+    ],
     "select_schedule": "Normaal",
     "sensors": {
       "illuminance": 0.25,
diff --git a/plugwise/common.py b/plugwise/common.py
index 933a2d6c2..9534a2263 100644
--- a/plugwise/common.py
+++ b/plugwise/common.py
@@ -10,6 +10,7 @@
 from plugwise.constants import (
     ANNA,
     NONE,
+    PRIORITY_DEVICE_CLASSES,
     SPECIAL_PLUG_TYPES,
     SWITCH_GROUP_TYPES,
     ApplianceType,
@@ -152,6 +153,16 @@ def _create_gw_entities(self, appl: Munch) -> None:
                 self.gw_entities[appl.entity_id][appl_key] = value
                 self._count += 1
 
+    def _reorder_devices(self) -> None:
+        """Place the gateway and optional heater_central devices as 1st and 2nd."""
+        reordered = {}
+        for dev_class in PRIORITY_DEVICE_CLASSES:
+            for entity_id, entity in dict(self.gw_entities).items():
+                if entity["dev_class"] == dev_class:
+                    reordered[entity_id] = self.gw_entities.pop(entity_id)
+                    break
+        self.gw_entities = {**reordered, **self.gw_entities}
+
     def _entity_switching_group(self, entity: GwEntityData, data: GwEntityData) -> None:
         """Helper-function for _get_device_zone_data().
 
diff --git a/plugwise/legacy/helper.py b/plugwise/legacy/helper.py
index 922663a28..d5e6918ab 100644
--- a/plugwise/legacy/helper.py
+++ b/plugwise/legacy/helper.py
@@ -23,7 +23,6 @@
     NONE,
     OFF,
     P1_LEGACY_MEASUREMENTS,
-    PRIORITY_DEVICE_CLASSES,
     TEMP_CELSIUS,
     THERMOSTAT_CLASSES,
     UOM,
@@ -138,16 +137,6 @@ def _all_appliances(self) -> None:
             self._create_gw_entities(appl)
             self._reorder_devices()
 
-    def _reorder_devices(self) -> None:
-        """Place the gateway and optional heater_central devices as 1st and 2nd."""
-        reordered = {}
-        for dev_class in PRIORITY_DEVICE_CLASSES:
-            for entity_id, entity in dict(self.gw_entities).items():
-                if entity["dev_class"] == dev_class:
-                    reordered[entity_id] = self.gw_entities.pop(entity_id)
-                    break
-        self.gw_entities = {**reordered, **self.gw_entities}
-
     def _all_locations(self) -> None:
         """Collect all locations."""
         loc = Munch()

From ffca9bce6ec2a17d93d3d02690cadee8fa67d71a Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 15:18:12 +0200
Subject: [PATCH 31/32] Reuse function in helper.py, clear old function

---
 plugwise/constants.py |  2 +-
 plugwise/helper.py    | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/plugwise/constants.py b/plugwise/constants.py
index 4e1becd56..4710229e8 100644
--- a/plugwise/constants.py
+++ b/plugwise/constants.py
@@ -86,7 +86,7 @@
 MODULE_LOCATOR: Final = "./logs/point_log/*[@id]"
 NONE: Final = "None"
 OFF: Final = "off"
-PRIORITY_DEVICE_CLASSES = ("heater_central", "gateway")
+PRIORITY_DEVICE_CLASSES = ("gateway", "heater_central")
 
 # XML data paths
 APPLIANCES: Final = "/core/appliances"
diff --git a/plugwise/helper.py b/plugwise/helper.py
index 1b66af34b..16ef1f0a3 100644
--- a/plugwise/helper.py
+++ b/plugwise/helper.py
@@ -28,7 +28,6 @@
     NONE,
     OFF,
     P1_MEASUREMENTS,
-    PRIORITY_DEVICE_CLASSES,
     TEMP_CELSIUS,
     THERMOSTAT_CLASSES,
     TOGGLES,
@@ -160,7 +159,7 @@ def _all_appliances(self) -> None:
             self._get_p1_smartmeter_info()
 
         # Sort the gw_entities
-        self._sort_gw_entities()
+        self._reorder_devices()
 
     def _get_p1_smartmeter_info(self) -> None:
         """For P1 collect the connected SmartMeter info from the Home/building location.
@@ -193,18 +192,6 @@ def _get_p1_smartmeter_info(self) -> None:
 
         self._create_gw_entities(appl)
 
-    def _sort_gw_entities(self) -> None:
-        """Place the gateway and optional heater_central entities as 1st and 2nd."""
-        for dev_class in PRIORITY_DEVICE_CLASSES:
-            for entity_id, entity in dict(self.gw_entities).items():
-                if entity["dev_class"] == dev_class:
-                    priority_entity = entity
-                    self.gw_entities.pop(entity_id)
-                    other_entities = self.gw_entities
-                    priority_entities = {entity_id: priority_entity}
-                    self.gw_entities = {**priority_entities, **other_entities}
-                    break
-
     def _all_locations(self) -> None:
         """Collect all locations."""
         loc = Munch()

From d1ee9d505216a02702b13ad8576aa5566915734d Mon Sep 17 00:00:00 2001
From: Bouwe Westerdijk <bouwe.s.westerdijk@gmail.com>
Date: Sat, 28 Jun 2025 15:23:54 +0200
Subject: [PATCH 32/32] Save updated fixtures

---
 fixtures/adam_heatpump_cooling/data.json      | 126 +++---------------
 fixtures/adam_jip/data.json                   |  77 ++---------
 .../adam_multiple_devices_per_zone/data.json  |  68 ++--------
 .../data.json                                 |  18 +--
 fixtures/adam_plus_anna/data.json             |  17 +--
 fixtures/adam_plus_anna_new/data.json         |  41 +-----
 .../data.json                                 |  41 +-----
 fixtures/adam_zone_per_device/data.json       |  76 ++---------
 fixtures/anna_heatpump_cooling/data.json      |  13 +-
 .../data.json                                 |  13 +-
 fixtures/anna_heatpump_heating/data.json      |  13 +-
 fixtures/anna_v4/data.json                    |  14 +-
 fixtures/anna_v4_dhw/data.json                |  14 +-
 fixtures/anna_v4_no_tag/data.json             |  14 +-
 fixtures/anna_without_boiler_fw441/data.json  |  14 +-
 15 files changed, 95 insertions(+), 464 deletions(-)

diff --git a/fixtures/adam_heatpump_cooling/data.json b/fixtures/adam_heatpump_cooling/data.json
index 9999ea242..04b033f2a 100644
--- a/fixtures/adam_heatpump_cooling/data.json
+++ b/fixtures/adam_heatpump_cooling/data.json
@@ -12,13 +12,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Slaapkamer SJ",
-    "preset_modes": [
-      "no_frost",
-      "vacation",
-      "away",
-      "home",
-      "asleep"
-    ],
+    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -32,9 +26,7 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": [
-        "d3a276aeb3114a509bab1e4bf8c40348"
-      ],
+      "primary": ["d3a276aeb3114a509bab1e4bf8c40348"],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -138,13 +130,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Slaapkamer DB",
-    "preset_modes": [
-      "no_frost",
-      "vacation",
-      "away",
-      "home",
-      "asleep"
-    ],
+    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -158,9 +144,7 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": [
-        "47e2c550a33846b680725aa3fb229473"
-      ],
+      "primary": ["47e2c550a33846b680725aa3fb229473"],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -260,13 +244,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Badkamer 2",
-    "preset_modes": [
-      "no_frost",
-      "vacation",
-      "away",
-      "home",
-      "asleep"
-    ],
+    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
     "select_schedule": "Werkdag schema",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -279,9 +257,7 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": [
-        "f04c985c11ad4848b8fcd710343f9dcf"
-      ],
+      "primary": ["f04c985c11ad4848b8fcd710343f9dcf"],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -312,11 +288,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",
@@ -414,13 +386,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Badkamer 1",
-    "preset_modes": [
-      "no_frost",
-      "vacation",
-      "away",
-      "home",
-      "asleep"
-    ],
+    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
     "select_schedule": "Werkdag schema",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -434,9 +400,7 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": [
-        "eac5db95d97241f6b17790897847ccf5"
-      ],
+      "primary": ["eac5db95d97241f6b17790897847ccf5"],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -454,13 +418,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Slaapkamer RB",
-    "preset_modes": [
-      "no_frost",
-      "vacation",
-      "away",
-      "home",
-      "asleep"
-    ],
+    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 3.13,
@@ -473,9 +431,7 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": [
-        "c4ed311d54e341f58b4cdd201d1fde7e"
-      ],
+      "primary": ["c4ed311d54e341f58b4cdd201d1fde7e"],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -513,13 +469,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Slaapkamer SQ",
-    "preset_modes": [
-      "no_frost",
-      "vacation",
-      "away",
-      "home",
-      "asleep"
-    ],
+    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -533,9 +483,7 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": [
-        "beb32da072274e698146db8b022f3c36"
-      ],
+      "primary": ["beb32da072274e698146db8b022f3c36"],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -573,13 +521,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Keuken",
-    "preset_modes": [
-      "no_frost",
-      "vacation",
-      "away",
-      "home",
-      "asleep"
-    ],
+    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
     "select_schedule": "Werkdag schema",
     "sensors": {
       "electricity_consumed": 2.13,
@@ -593,9 +535,7 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": [
-        "ea8372c0e3ad4622ad45a041d02425f5"
-      ],
+      "primary": ["ea8372c0e3ad4622ad45a041d02425f5"],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -613,13 +553,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Bijkeuken",
-    "preset_modes": [
-      "no_frost",
-      "vacation",
-      "away",
-      "home",
-      "asleep"
-    ],
+    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -633,9 +567,7 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": [
-        "1053c8bbf8be43c6921742b146a625f1"
-      ],
+      "primary": ["1053c8bbf8be43c6921742b146a625f1"],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -751,13 +683,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Slaapkamer JM",
-    "preset_modes": [
-      "no_frost",
-      "vacation",
-      "away",
-      "home",
-      "asleep"
-    ],
+    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -771,9 +697,7 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": [
-        "7fda9f84f01342f8afe9ebbbbff30c0f"
-      ],
+      "primary": ["7fda9f84f01342f8afe9ebbbbff30c0f"],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -861,13 +785,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Woonkamer",
-    "preset_modes": [
-      "no_frost",
-      "vacation",
-      "away",
-      "home",
-      "asleep"
-    ],
+    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
     "select_schedule": "Werkdag schema",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -881,9 +799,7 @@
       "upper_bound": 35.0
     },
     "thermostats": {
-      "primary": [
-        "ca79d23ae0094120b877558734cff85c"
-      ],
+      "primary": ["ca79d23ae0094120b877558734cff85c"],
       "secondary": []
     },
     "vendor": "Plugwise"
diff --git a/fixtures/adam_jip/data.json b/fixtures/adam_jip/data.json
index 5e72ad345..ba23d9418 100644
--- a/fixtures/adam_jip/data.json
+++ b/fixtures/adam_jip/data.json
@@ -6,13 +6,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Slaapkamer",
-    "preset_modes": [
-      "home",
-      "asleep",
-      "away",
-      "vacation",
-      "no_frost"
-    ],
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
     "sensors": {
       "temperature": 24.2
     },
@@ -23,12 +17,8 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": [
-        "1346fbd8498d4dbcab7e18d51b771f3d"
-      ],
-      "secondary": [
-        "356b65335e274d769c338223e7af9c33"
-      ]
+      "primary": ["1346fbd8498d4dbcab7e18d51b771f3d"],
+      "secondary": ["356b65335e274d769c338223e7af9c33"]
     },
     "vendor": "Plugwise"
   },
@@ -39,13 +29,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Woonkamer",
-    "preset_modes": [
-      "home",
-      "asleep",
-      "away",
-      "vacation",
-      "no_frost"
-    ],
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
     "sensors": {
       "temperature": 27.4
     },
@@ -56,12 +40,8 @@
       "upper_bound": 30.0
     },
     "thermostats": {
-      "primary": [
-        "f61f1a2535f54f52ad006a3d18e459ca"
-      ],
-      "secondary": [
-        "833de10f269c4deab58fb9df69901b4e"
-      ]
+      "primary": ["f61f1a2535f54f52ad006a3d18e459ca"],
+      "secondary": ["833de10f269c4deab58fb9df69901b4e"]
     },
     "vendor": "Plugwise"
   },
@@ -238,11 +218,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": "9e4433a9d69f40b3aefd15e74395eaec",
     "mac_address": "012345670001",
@@ -250,12 +226,7 @@
     "model_id": "smile_open_therm",
     "name": "Adam",
     "notifications": {},
-    "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": {
@@ -271,13 +242,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Kinderkamer",
-    "preset_modes": [
-      "home",
-      "asleep",
-      "away",
-      "vacation",
-      "no_frost"
-    ],
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
     "sensors": {
       "temperature": 30.0
     },
@@ -288,12 +253,8 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": [
-        "6f3e9d7084214c21b9dfa46f6eeb8700"
-      ],
-      "secondary": [
-        "d4496250d0e942cfa7aea3476e9070d5"
-      ]
+      "primary": ["6f3e9d7084214c21b9dfa46f6eeb8700"],
+      "secondary": ["d4496250d0e942cfa7aea3476e9070d5"]
     },
     "vendor": "Plugwise"
   },
@@ -328,13 +289,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Logeerkamer",
-    "preset_modes": [
-      "home",
-      "asleep",
-      "away",
-      "vacation",
-      "no_frost"
-    ],
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
     "sensors": {
       "temperature": 30.0
     },
@@ -345,12 +300,8 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": [
-        "a6abc6a129ee499c88a4d420cc413b47"
-      ],
-      "secondary": [
-        "1da4d325838e4ad8aac12177214505c9"
-      ]
+      "primary": ["a6abc6a129ee499c88a4d420cc413b47"],
+      "secondary": ["1da4d325838e4ad8aac12177214505c9"]
     },
     "vendor": "Plugwise"
   },
diff --git a/fixtures/adam_multiple_devices_per_zone/data.json b/fixtures/adam_multiple_devices_per_zone/data.json
index 84dd7ce7b..8937cd465 100644
--- a/fixtures/adam_multiple_devices_per_zone/data.json
+++ b/fixtures/adam_multiple_devices_per_zone/data.json
@@ -35,13 +35,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Badkamer",
-    "preset_modes": [
-      "home",
-      "asleep",
-      "away",
-      "vacation",
-      "no_frost"
-    ],
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
     "select_schedule": "Badkamer Schema",
     "sensors": {
       "temperature": 18.9
@@ -76,13 +70,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Bios",
-    "preset_modes": [
-      "home",
-      "asleep",
-      "away",
-      "vacation",
-      "no_frost"
-    ],
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -96,12 +84,8 @@
       "upper_bound": 100.0
     },
     "thermostats": {
-      "primary": [
-        "df4a4a8169904cdb9c03d61a21f42140"
-      ],
-      "secondary": [
-        "a2c3583e0a6349358998b760cea82d2a"
-      ]
+      "primary": ["df4a4a8169904cdb9c03d61a21f42140"],
+      "secondary": ["a2c3583e0a6349358998b760cea82d2a"]
     },
     "vendor": "Plugwise"
   },
@@ -141,13 +125,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Garage",
-    "preset_modes": [
-      "home",
-      "asleep",
-      "away",
-      "vacation",
-      "no_frost"
-    ],
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
     "select_schedule": "off",
     "sensors": {
       "temperature": 15.6
@@ -159,9 +137,7 @@
       "upper_bound": 100.0
     },
     "thermostats": {
-      "primary": [
-        "e7693eb9582644e5b865dba8d4447cf1"
-      ],
+      "primary": ["e7693eb9582644e5b865dba8d4447cf1"],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -297,13 +273,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Jessie",
-    "preset_modes": [
-      "home",
-      "asleep",
-      "away",
-      "vacation",
-      "no_frost"
-    ],
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
     "select_schedule": "CV Jessie",
     "sensors": {
       "temperature": 17.2
@@ -315,12 +285,8 @@
       "upper_bound": 100.0
     },
     "thermostats": {
-      "primary": [
-        "6a3bf693d05e48e0b460c815a4fdd09d"
-      ],
-      "secondary": [
-        "d3da73bde12a47d5a6b8f9dad971f2ec"
-      ]
+      "primary": ["6a3bf693d05e48e0b460c815a4fdd09d"],
+      "secondary": ["d3da73bde12a47d5a6b8f9dad971f2ec"]
     },
     "vendor": "Plugwise"
   },
@@ -452,13 +418,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Woonkamer",
-    "preset_modes": [
-      "home",
-      "asleep",
-      "away",
-      "vacation",
-      "no_frost"
-    ],
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
     "select_schedule": "GF7  Woonkamer",
     "sensors": {
       "electricity_consumed": 35.6,
@@ -472,12 +432,8 @@
       "upper_bound": 100.0
     },
     "thermostats": {
-      "primary": [
-        "b59bcebaf94b499ea7d46e4a66fb62d8"
-      ],
-      "secondary": [
-        "b310b72a0e354bfab43089919b9a88bf"
-      ]
+      "primary": ["b59bcebaf94b499ea7d46e4a66fb62d8"],
+      "secondary": ["b310b72a0e354bfab43089919b9a88bf"]
     },
     "vendor": "Plugwise"
   },
diff --git a/fixtures/adam_onoff_cooling_fake_firmware/data.json b/fixtures/adam_onoff_cooling_fake_firmware/data.json
index a356c6aa9..4803aad72 100644
--- a/fixtures/adam_onoff_cooling_fake_firmware/data.json
+++ b/fixtures/adam_onoff_cooling_fake_firmware/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",
@@ -94,13 +90,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Woonkamer",
-    "preset_modes": [
-      "no_frost",
-      "vacation",
-      "away",
-      "home",
-      "asleep"
-    ],
+    "preset_modes": ["no_frost", "vacation", "away", "home", "asleep"],
     "select_schedule": "Werkdag schema",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -114,9 +104,7 @@
       "upper_bound": 35.0
     },
     "thermostats": {
-      "primary": [
-        "ca79d23ae0094120b877558734cff85c"
-      ],
+      "primary": ["ca79d23ae0094120b877558734cff85c"],
       "secondary": []
     },
     "vendor": "Plugwise"
diff --git a/fixtures/adam_plus_anna/data.json b/fixtures/adam_plus_anna/data.json
index 108b84c5f..fd25947a0 100644
--- a/fixtures/adam_plus_anna/data.json
+++ b/fixtures/adam_plus_anna/data.json
@@ -1,22 +1,13 @@
 {
   "009490cc2f674ce6b576863fbb64f867": {
     "active_preset": "home",
-    "available_schedules": [
-      "Weekschema",
-      "off"
-    ],
+    "available_schedules": ["Weekschema", "off"],
     "climate_mode": "auto",
     "control_state": "idle",
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Living room",
-    "preset_modes": [
-      "home",
-      "asleep",
-      "away",
-      "vacation",
-      "no_frost"
-    ],
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
     "select_schedule": "Weekschema",
     "sensors": {
       "electricity_consumed": 74.2,
@@ -30,9 +21,7 @@
       "upper_bound": 35.0
     },
     "thermostats": {
-      "primary": [
-        "ee62cad889f94e8ca3d09021f03a660b"
-      ],
+      "primary": ["ee62cad889f94e8ca3d09021f03a660b"],
       "secondary": []
     },
     "vendor": "Plugwise"
diff --git a/fixtures/adam_plus_anna_new/data.json b/fixtures/adam_plus_anna_new/data.json
index b98126e3a..fd87b10ab 100644
--- a/fixtures/adam_plus_anna_new/data.json
+++ b/fixtures/adam_plus_anna_new/data.json
@@ -161,11 +161,7 @@
     },
     "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",
@@ -173,12 +169,7 @@
     "model_id": "smile_open_therm",
     "name": "Adam",
     "notifications": {},
-    "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": {
@@ -240,13 +231,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Living room",
-    "preset_modes": [
-      "no_frost",
-      "asleep",
-      "vacation",
-      "home",
-      "away"
-    ],
+    "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
     "select_schedule": "Weekschema",
     "sensors": {
       "electricity_consumed": 149.9,
@@ -260,9 +245,7 @@
       "upper_bound": 35.0
     },
     "thermostats": {
-      "primary": [
-        "ad4838d7d35c4d6ea796ee12ae5aedf8"
-      ],
+      "primary": ["ad4838d7d35c4d6ea796ee12ae5aedf8"],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -281,13 +264,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Bathroom",
-    "preset_modes": [
-      "no_frost",
-      "asleep",
-      "vacation",
-      "home",
-      "away"
-    ],
+    "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
     "select_schedule": "Badkamer",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -301,12 +278,8 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": [
-        "e2f4322d57924fa090fbbc48b3a140dc"
-      ],
-      "secondary": [
-        "1772a4ea304041adb83f357b751341ff"
-      ]
+      "primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
+      "secondary": ["1772a4ea304041adb83f357b751341ff"]
     },
     "vendor": "Plugwise"
   }
diff --git a/fixtures/adam_plus_anna_new_regulation_off/data.json b/fixtures/adam_plus_anna_new_regulation_off/data.json
index e95fe8311..93710a1fa 100644
--- a/fixtures/adam_plus_anna_new_regulation_off/data.json
+++ b/fixtures/adam_plus_anna_new_regulation_off/data.json
@@ -161,11 +161,7 @@
     },
     "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",
@@ -173,12 +169,7 @@
     "model_id": "smile_open_therm",
     "name": "Adam",
     "notifications": {},
-    "regulation_modes": [
-      "bleeding_hot",
-      "bleeding_cold",
-      "off",
-      "heating"
-    ],
+    "regulation_modes": ["bleeding_hot", "bleeding_cold", "off", "heating"],
     "select_gateway_mode": "full",
     "select_regulation_mode": "off",
     "sensors": {
@@ -240,13 +231,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Living room",
-    "preset_modes": [
-      "no_frost",
-      "asleep",
-      "vacation",
-      "home",
-      "away"
-    ],
+    "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 149.9,
@@ -260,9 +245,7 @@
       "upper_bound": 35.0
     },
     "thermostats": {
-      "primary": [
-        "ad4838d7d35c4d6ea796ee12ae5aedf8"
-      ],
+      "primary": ["ad4838d7d35c4d6ea796ee12ae5aedf8"],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -281,13 +264,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Bathroom",
-    "preset_modes": [
-      "no_frost",
-      "asleep",
-      "vacation",
-      "home",
-      "away"
-    ],
+    "preset_modes": ["no_frost", "asleep", "vacation", "home", "away"],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -301,12 +278,8 @@
       "upper_bound": 99.9
     },
     "thermostats": {
-      "primary": [
-        "e2f4322d57924fa090fbbc48b3a140dc"
-      ],
-      "secondary": [
-        "1772a4ea304041adb83f357b751341ff"
-      ]
+      "primary": ["e2f4322d57924fa090fbbc48b3a140dc"],
+      "secondary": ["1772a4ea304041adb83f357b751341ff"]
     },
     "vendor": "Plugwise"
   }
diff --git a/fixtures/adam_zone_per_device/data.json b/fixtures/adam_zone_per_device/data.json
index 57a94c9b5..b53a5c357 100644
--- a/fixtures/adam_zone_per_device/data.json
+++ b/fixtures/adam_zone_per_device/data.json
@@ -35,13 +35,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Badkamer",
-    "preset_modes": [
-      "home",
-      "asleep",
-      "away",
-      "vacation",
-      "no_frost"
-    ],
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
     "select_schedule": "Badkamer Schema",
     "sensors": {
       "temperature": 18.8
@@ -53,12 +47,8 @@
       "upper_bound": 100.0
     },
     "thermostats": {
-      "primary": [
-        "f1fee6043d3642a9b0a65297455f008e"
-      ],
-      "secondary": [
-        "680423ff840043738f42cc7f1ff97a36"
-      ]
+      "primary": ["f1fee6043d3642a9b0a65297455f008e"],
+      "secondary": ["680423ff840043738f42cc7f1ff97a36"]
     },
     "vendor": "Plugwise"
   },
@@ -77,13 +67,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Bios",
-    "preset_modes": [
-      "home",
-      "asleep",
-      "away",
-      "vacation",
-      "no_frost"
-    ],
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
     "select_schedule": "off",
     "sensors": {
       "electricity_consumed": 0.0,
@@ -97,12 +81,8 @@
       "upper_bound": 100.0
     },
     "thermostats": {
-      "primary": [
-        "df4a4a8169904cdb9c03d61a21f42140"
-      ],
-      "secondary": [
-        "a2c3583e0a6349358998b760cea82d2a"
-      ]
+      "primary": ["df4a4a8169904cdb9c03d61a21f42140"],
+      "secondary": ["a2c3583e0a6349358998b760cea82d2a"]
     },
     "vendor": "Plugwise"
   },
@@ -142,13 +122,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Garage",
-    "preset_modes": [
-      "home",
-      "asleep",
-      "away",
-      "vacation",
-      "no_frost"
-    ],
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
     "select_schedule": "off",
     "sensors": {
       "temperature": 15.6
@@ -160,9 +134,7 @@
       "upper_bound": 100.0
     },
     "thermostats": {
-      "primary": [
-        "e7693eb9582644e5b865dba8d4447cf1"
-      ],
+      "primary": ["e7693eb9582644e5b865dba8d4447cf1"],
       "secondary": []
     },
     "vendor": "Plugwise"
@@ -298,13 +270,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Jessie",
-    "preset_modes": [
-      "home",
-      "asleep",
-      "away",
-      "vacation",
-      "no_frost"
-    ],
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
     "select_schedule": "CV Jessie",
     "sensors": {
       "temperature": 17.1
@@ -316,12 +282,8 @@
       "upper_bound": 100.0
     },
     "thermostats": {
-      "primary": [
-        "6a3bf693d05e48e0b460c815a4fdd09d"
-      ],
-      "secondary": [
-        "d3da73bde12a47d5a6b8f9dad971f2ec"
-      ]
+      "primary": ["6a3bf693d05e48e0b460c815a4fdd09d"],
+      "secondary": ["d3da73bde12a47d5a6b8f9dad971f2ec"]
     },
     "vendor": "Plugwise"
   },
@@ -453,13 +415,7 @@
     "dev_class": "climate",
     "model": "ThermoZone",
     "name": "Woonkamer",
-    "preset_modes": [
-      "home",
-      "asleep",
-      "away",
-      "vacation",
-      "no_frost"
-    ],
+    "preset_modes": ["home", "asleep", "away", "vacation", "no_frost"],
     "select_schedule": "GF7  Woonkamer",
     "sensors": {
       "electricity_consumed": 35.8,
@@ -473,12 +429,8 @@
       "upper_bound": 100.0
     },
     "thermostats": {
-      "primary": [
-        "b59bcebaf94b499ea7d46e4a66fb62d8"
-      ],
-      "secondary": [
-        "b310b72a0e354bfab43089919b9a88bf"
-      ]
+      "primary": ["b59bcebaf94b499ea7d46e4a66fb62d8"],
+      "secondary": ["b310b72a0e354bfab43089919b9a88bf"]
     },
     "vendor": "Plugwise"
   },
diff --git a/fixtures/anna_heatpump_cooling/data.json b/fixtures/anna_heatpump_cooling/data.json
index f1bdd86fe..c722045a2 100644
--- a/fixtures/anna_heatpump_cooling/data.json
+++ b/fixtures/anna_heatpump_cooling/data.json
@@ -55,10 +55,7 @@
   },
   "3cb70739631c4d17a86b8b12e8a5161b": {
     "active_preset": "home",
-    "available_schedules": [
-      "standaard",
-      "off"
-    ],
+    "available_schedules": ["standaard", "off"],
     "climate_mode": "heat_cool",
     "control_state": "cooling",
     "dev_class": "thermostat",
@@ -67,13 +64,7 @@
     "location": "c784ee9fdab44e1395b8dee7d7a497d5",
     "model": "ThermoTouch",
     "name": "Anna",
-    "preset_modes": [
-      "no_frost",
-      "home",
-      "away",
-      "asleep",
-      "vacation"
-    ],
+    "preset_modes": ["no_frost", "home", "away", "asleep", "vacation"],
     "select_schedule": "off",
     "sensors": {
       "cooling_activation_outdoor_temperature": 21.0,
diff --git a/fixtures/anna_heatpump_cooling_fake_firmware/data.json b/fixtures/anna_heatpump_cooling_fake_firmware/data.json
index f08a11bba..4218240cb 100644
--- a/fixtures/anna_heatpump_cooling_fake_firmware/data.json
+++ b/fixtures/anna_heatpump_cooling_fake_firmware/data.json
@@ -55,10 +55,7 @@
   },
   "3cb70739631c4d17a86b8b12e8a5161b": {
     "active_preset": "home",
-    "available_schedules": [
-      "standaard",
-      "off"
-    ],
+    "available_schedules": ["standaard", "off"],
     "climate_mode": "heat_cool",
     "control_state": "cooling",
     "dev_class": "thermostat",
@@ -67,13 +64,7 @@
     "location": "c784ee9fdab44e1395b8dee7d7a497d5",
     "model": "ThermoTouch",
     "name": "Anna",
-    "preset_modes": [
-      "no_frost",
-      "home",
-      "away",
-      "asleep",
-      "vacation"
-    ],
+    "preset_modes": ["no_frost", "home", "away", "asleep", "vacation"],
     "select_schedule": "off",
     "sensors": {
       "cooling_activation_outdoor_temperature": 21.0,
diff --git a/fixtures/anna_heatpump_heating/data.json b/fixtures/anna_heatpump_heating/data.json
index 2d90b6f12..ab6bdf08e 100644
--- a/fixtures/anna_heatpump_heating/data.json
+++ b/fixtures/anna_heatpump_heating/data.json
@@ -60,10 +60,7 @@
   },
   "3cb70739631c4d17a86b8b12e8a5161b": {
     "active_preset": "home",
-    "available_schedules": [
-      "standaard",
-      "off"
-    ],
+    "available_schedules": ["standaard", "off"],
     "climate_mode": "auto",
     "control_state": "heating",
     "dev_class": "thermostat",
@@ -72,13 +69,7 @@
     "location": "c784ee9fdab44e1395b8dee7d7a497d5",
     "model": "ThermoTouch",
     "name": "Anna",
-    "preset_modes": [
-      "no_frost",
-      "home",
-      "away",
-      "asleep",
-      "vacation"
-    ],
+    "preset_modes": ["no_frost", "home", "away", "asleep", "vacation"],
     "select_schedule": "standaard",
     "sensors": {
       "cooling_activation_outdoor_temperature": 21.0,
diff --git a/fixtures/anna_v4/data.json b/fixtures/anna_v4/data.json
index a64605171..7e6f138be 100644
--- a/fixtures/anna_v4/data.json
+++ b/fixtures/anna_v4/data.json
@@ -1,11 +1,7 @@
 {
   "01b85360fdd243d0aaad4d6ac2a5ba7e": {
     "active_preset": "home",
-    "available_schedules": [
-      "Standaard",
-      "Thuiswerken",
-      "off"
-    ],
+    "available_schedules": ["Standaard", "Thuiswerken", "off"],
     "climate_mode": "heat",
     "control_state": "heating",
     "dev_class": "thermostat",
@@ -14,13 +10,7 @@
     "location": "eb5309212bf5407bb143e5bfa3b18aee",
     "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/data.json b/fixtures/anna_v4_dhw/data.json
index 677d0a622..a560de161 100644
--- a/fixtures/anna_v4_dhw/data.json
+++ b/fixtures/anna_v4_dhw/data.json
@@ -1,11 +1,7 @@
 {
   "01b85360fdd243d0aaad4d6ac2a5ba7e": {
     "active_preset": "home",
-    "available_schedules": [
-      "Standaard",
-      "Thuiswerken",
-      "off"
-    ],
+    "available_schedules": ["Standaard", "Thuiswerken", "off"],
     "climate_mode": "heat",
     "control_state": "idle",
     "dev_class": "thermostat",
@@ -14,13 +10,7 @@
     "location": "eb5309212bf5407bb143e5bfa3b18aee",
     "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_no_tag/data.json b/fixtures/anna_v4_no_tag/data.json
index 926b858e2..513e7ce20 100644
--- a/fixtures/anna_v4_no_tag/data.json
+++ b/fixtures/anna_v4_no_tag/data.json
@@ -1,11 +1,7 @@
 {
   "01b85360fdd243d0aaad4d6ac2a5ba7e": {
     "active_preset": "home",
-    "available_schedules": [
-      "Standaard",
-      "Thuiswerken",
-      "off"
-    ],
+    "available_schedules": ["Standaard", "Thuiswerken", "off"],
     "climate_mode": "auto",
     "control_state": "heating",
     "dev_class": "thermostat",
@@ -14,13 +10,7 @@
     "location": "eb5309212bf5407bb143e5bfa3b18aee",
     "model": "ThermoTouch",
     "name": "Anna",
-    "preset_modes": [
-      "vacation",
-      "no_frost",
-      "away",
-      "asleep",
-      "home"
-    ],
+    "preset_modes": ["vacation", "no_frost", "away", "asleep", "home"],
     "select_schedule": "Thuiswerken",
     "sensors": {
       "illuminance": 60.0,
diff --git a/fixtures/anna_without_boiler_fw441/data.json b/fixtures/anna_without_boiler_fw441/data.json
index 7cc9eaff3..7e0b7cc4f 100644
--- a/fixtures/anna_without_boiler_fw441/data.json
+++ b/fixtures/anna_without_boiler_fw441/data.json
@@ -1,11 +1,7 @@
 {
   "7ffbb3ab4b6c4ab2915d7510f7bf8fe9": {
     "active_preset": "home",
-    "available_schedules": [
-      "Test",
-      "Normaal",
-      "off"
-    ],
+    "available_schedules": ["Test", "Normaal", "off"],
     "climate_mode": "auto",
     "control_state": "idle",
     "dev_class": "thermostat",
@@ -14,13 +10,7 @@
     "location": "c34c6864216446528e95d88985e714cc",
     "model": "ThermoTouch",
     "name": "Anna",
-    "preset_modes": [
-      "no_frost",
-      "asleep",
-      "away",
-      "vacation",
-      "home"
-    ],
+    "preset_modes": ["no_frost", "asleep", "away", "vacation", "home"],
     "select_schedule": "Normaal",
     "sensors": {
       "illuminance": 0.25,