Update test-jsons

Author: bouwew

fixtures/anna_v4/all_data.json

@@ -33,12 +33,6 @@
         "setpoint": 0.0,
         "upper_bound": 2.0
       },
-      "thermostat": {
-        "lower_bound": 4.0,
-        "resolution": 0.1,
-        "setpoint": 20.5,
-        "upper_bound": 30.0
-      },
       "vendor": "Plugwise"
     },
     "0466eae8520144c78afb29628384edeb": {
@@ -99,9 +93,10 @@
     "cooling_present": false,
     "gateway_id": "0466eae8520144c78afb29628384edeb",
     "heater_id": "cd0e6156b1f04d5f952349ffbe397481",
-    "item_count": 58,
+    "item_count": 50,
     "notifications": {},
     "reboot": true,
     "smile_name": "Smile Anna"
-  }
+  },
+  "zones": {}
 }

plugwise/data.py

@@ -34,7 +34,8 @@ def _all_device_data(self) -> None:
         Collect data for each device and add to self.gw_data and self.gw_devices.
         """
         self._update_gw_devices()
-        self._update_zones()
+        if self.smile(ADAM):
+            self._update_zones()
         self.gw_data.update(
             {
                 "gateway_id": self.gateway_id,
@@ -190,6 +191,10 @@ def _get_device_data(self, dev_id: str) -> DeviceData:
         # Adam data
         self._device_data_adam(device, data)
 
+        # Thermostat data for Anna (presets, temperatures etc)
+        if self.smile(ANNA) and device["dev_class"] == "thermostat":
+            self._device_data_climate(dev_id, device, data)
+
         return data
 
     def _check_availability(
@@ -232,11 +237,15 @@ def _device_data_adam(self, device: DeviceData, data: DeviceData) -> None:
                     self._count += 1
 
 
-    def _device_data_climate(self, loc_id: str, device: DeviceData, data: DeviceData) -> None:
+    def _device_data_climate(self, location_id: str, device: DeviceData, data: DeviceData) -> None:
         """Helper-function for _get_device_data().
 
         Determine climate-control device data.
         """
+        loc_id = location_id
+        if (dev_loc := device.get("location")) is not None:
+            loc_id = dev_loc
+
         # Presets
         data["preset_modes"] = None
         data["active_preset"] = None

plugwise/helper.py

@@ -855,7 +855,7 @@ def _match_locations(self) -> dict[str, ThermoLoc]:
             for appliance_details in self.gw_devices.values():
                 if appliance_details["location"] == location_id:
                     location_details.update(
-                        {"primary": set(), "primary_prio": 0, "secondary": set()}
+                        {"primary": [], "primary_prio": 0, "secondary": []}
                     )
                     matched_locations[location_id] = location_details
 
@@ -880,13 +880,13 @@ def _rank_thermostat(
             if thermo_matching[appl_class] > self._thermo_locs[loc_id]["primary_prio"]:
                 # Demote former primary
                 if (tl_primary:= self._thermo_locs[loc_id]["primary"]):
-                    self._thermo_locs[loc_id]["secondary"].add(tl_primary)
+                    self._thermo_locs[loc_id]["secondary"].append(tl_primary)
 
                 # Crown primary
                 self._thermo_locs[loc_id]["primary_prio"] = thermo_matching[appl_class]
-                self._thermo_locs[loc_id]["primary"].add(appliance_id)
+                self._thermo_locs[loc_id]["primary"].append(appliance_id)
             else:
-                self._thermo_locs[loc_id]["secondary"].add(appliance_id)
+                self._thermo_locs[loc_id]["secondary"].append(appliance_id)
 
     def _control_state(self, loc_id: str) -> str | bool:
         """Helper-function for _device_data_adam().