Merge pull request #353 from plugwise/p1v2-fail

Improvements

Author: bouwew

CHANGELOG.md

@@ -6,6 +6,8 @@
 - Correct non-unique device names in adam_jip userdata
 - Add domestic_hot_water_setpoint data to anna_heatpump_heating userdata, update relevant test-cases
 - Add raising an error when providing the wrong type of temperature input to set_temperature() with cooling active
+- Add preliminary support for python 3.12 by updating build system requirements
+- Code improvements
 
 ## V0.31.6: Fix domestic_hot_water_setpoint-related bug for Anna + Elga
 

plugwise/__init__.py

@@ -19,7 +19,6 @@
     DEFAULT_TIMEOUT,
     DEFAULT_USERNAME,
     DOMAIN_OBJECTS,
-    LEGACY_SMILES,
     LOCATIONS,
     LOGGER,
     MAX_SETPOINT,
@@ -389,7 +388,6 @@ async def _smile_detect_legacy(
                     network = zb_network.find("./master_controller")
                     self.smile_zigbee_mac_address = network.find("mac_address").text
 
-        self._smile_legacy = True
         # Legacy Anna or Stretch:
         if (
             result.find('./appliance[type="thermostat"]') is not None
@@ -421,6 +419,7 @@ async def _smile_detect_legacy(
                 )
                 raise ResponseError
 
+        self._smile_legacy = True
         return model
 
     async def _smile_detect(self, result: etree, dsmrmain: etree) -> None:
@@ -463,9 +462,6 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None:
         self.smile_type = SMILES[target_smile].smile_type
         self.smile_version = (self.smile_fw_version, ver)
 
-        if target_smile in LEGACY_SMILES:
-            self._smile_legacy = True
-
         if self.smile_type == "stretch":
             self._stretch_v2 = self.smile_version[1].major == 2
             self._stretch_v3 = self.smile_version[1].major == 3

plugwise/constants.py

@@ -98,12 +98,6 @@
     "070051": "Switch",
     "080029": "Switch",
 }
-LEGACY_SMILES: Final[tuple[str, ...]] = (
-    "smile_thermo_v1",
-    "smile_v2",
-    "stretch_v2",
-    "stretch_v3",
-)
 LIMITS: Final[tuple[str, ...]] = (
     "setpoint",
     "lower_bound",

plugwise/helper.py

@@ -395,27 +395,12 @@ def __init__(self) -> None:
         self.smile_version: tuple[str, semver.version.Version]
         self.smile_zigbee_mac_address: str | None = None
 
-    def _locations_specials(self, loc: Munch, location: str) -> Munch:
-        """Helper-function for _all_locations().
-
-        Correct location info in special cases.
-        """
-        if loc.name == "Home":
-            self._home_location = loc.loc_id
-
-        # Replace location-name for P1 legacy, can contain privacy-related info
-        if self._smile_legacy and self.smile_type == "power":
-            loc.name = "Home"
-            self._home_location = loc.loc_id
-
-        return loc
-
     def _all_locations(self) -> None:
         """Collect all locations."""
         loc = Munch()
 
-        # Legacy Anna without outdoor_temp and Stretches have no locations, create one containing all appliances
         locations = self._locations.findall("./location")
+        # Legacy Anna without outdoor_temp and Stretches have no locations, create fake location-data
         if not locations and self._smile_legacy:
             self._home_location = FAKE_LOC
             self._loc_data[FAKE_LOC] = {"name": "Home"}
@@ -433,8 +418,12 @@ def _all_locations(self) -> None:
             ):
                 continue
 
-            # Specials
-            loc = self._locations_specials(loc, location)
+            if loc.name == "Home":
+                self._home_location = loc.loc_id
+            # Replace location-name for P1 legacy, can contain privacy-related info
+            if self._smile_legacy and self.smile_type == "power":
+                loc.name = "Home"
+                self._home_location = loc.loc_id
 
             self._loc_data[loc.loc_id] = {"name": loc.name}