More updates

Author: bouwew

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)
 

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)
 

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