Change anna_p1 indication, collect smartmeter data when available

Author: bouwew

plugwise/__init__.py

@@ -75,6 +75,7 @@ def __init__(
         self._stretch_v2 = False
         self._target_smile: str = NONE
         self.smile: Munch = Munch()
+        self.smile.anna_p1 = False
         self.smile.hostname = NONE
         self.smile.hw_version = None
         self.smile.legacy = False
@@ -191,20 +192,20 @@ async def _smile_detect(
         if (gateway := result.find("./gateway")) is not None:
             if (vendor_model := gateway.find("vendor_model")) is not None:
                 model = vendor_model.text
+                elec_measurement = gateway.find(
+                    "gateway_environment/electricity_consumption_tariff_structure"
+                )
                 if (
-                    elec_measurement := gateway.find(
-                        "gateway_environment/electricity_consumption_tariff_structure"
-                    )
-                ) and elec_measurement.text:
-                    parts = model.split("_")
-                    if len(parts) == 2:  # looking for "smile_thermo"
-                        model = parts[0] + parts[1] + "_power"
+                    elec_measurement is not None
+                    and elec_measurement.text
+                    and model == "smile_thermo"
+                ):
+                    self.smile.anna_p1 = True
 
             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
-
         else:
             model = await self._smile_detect_legacy(result, dsmrmain, model)
 
@@ -243,6 +244,8 @@ async def _smile_detect(
         self.smile.model_id = model
         self.smile.name = SMILES[self._target_smile].smile_name
         self.smile.type = SMILES[self._target_smile].smile_type
+        if self.smile.name == "Smile Anna" and self.smile.anna_p1:
+            self.smile.name == "Smile Anna P1"
 
         if self.smile.type == "stretch":
             self._stretch_v2 = int(version_major) == 2

plugwise/constants.py

@@ -221,7 +221,6 @@
     "smile_thermo_v1": SMILE(THERMOSTAT, ANNA),
     "smile_thermo_v3": SMILE(THERMOSTAT, ANNA),
     "smile_thermo_v4": SMILE(THERMOSTAT, ANNA),
-    "smile_thermo_power_v4": SMILE("thermostat_power", ANNA_P1),
     "stretch_v2": SMILE(STRETCH, "Stretch"),
     "stretch_v3": SMILE(STRETCH, "Stretch"),
 }

plugwise/helper.py

@@ -150,7 +150,7 @@ def _all_appliances(self) -> None:
 
             self._create_gw_entities(appl)
 
-        if self.smile.type == "power":
+        if self.smile.type == "power" or self.smile.anna_p1:
             self._get_p1_smartmeter_info()
 
         # Sort the gw_entities