Change the THERMO_MATCHING constant

Author: bouwew

plugwise/constants.py

@@ -92,6 +92,12 @@
 NONE: Final = "None"
 OFF: Final = "off"
 PRIORITY_DEVICE_CLASSES = ("gateway", "heater_central")
+THERMO_MATCHING: dict[str, int] = {
+    "thermostat": 2,
+    "zone_thermometer": 2,
+    "zone_thermostat": 2,
+    "thermostatic_radiator_valve": 1,
+}
 
 # XML data paths
 APPLIANCES: Final = "/core/appliances"

plugwise/helper.py

@@ -30,6 +30,7 @@
     OFF,
     P1_MEASUREMENTS,
     TEMP_CELSIUS,
+    THERMO_MATCHING,
     THERMOSTAT_CLASSES,
     TOGGLES,
     UOM,
@@ -162,12 +163,9 @@ def _get_appliances(self) -> bool:
 
         removed = list(set(self._existing_appliances) - set(self._new_appliances))
         if self._existing_appliances:
-            if not removed:
-                return False
-            else:
-                for appliance in removed:
-                    self.gw_entities.pop(appliance)
-                return False
+            for appliance in removed:
+                self.gw_entities.pop(appliance)
+            return False
 
         # A smartmeter is not present as an appliance, add it specifically
         if not self._existing_appliances and (
@@ -832,16 +830,10 @@ def _match_and_rank_thermostats(self) -> dict[str, ThermoLoc]:
 
         Match thermostat-appliances with locations, rank them for locations with multiple thermostats.
         """
-        thermo_matching: dict[str, int] = {
-            "thermostat": 2,
-            "zone_thermometer": 2,
-            "zone_thermostat": 2,
-            "thermostatic_radiator_valve": 1,
-        }
         for location_id, location in self._loc_data.items():
             for entity_id, entity in self.gw_entities.items():
                 self._rank_thermostat(
-                    entity_id, entity, location_id, location, thermo_matching
+                    entity_id, entity, location_id, location, THERMO_MATCHING
                 )
 
     def _rank_thermostat(