Merge pull request #155 from plugwise/fix_control_state

Revert bad changes, more improvements found

Author: bouwew

plugwise/__init__.py

@@ -1,6 +1,6 @@
 """Plugwise module."""
 
-__version__ = "0.16.7a2"
+__version__ = "0.16.7a4"
 
 from plugwise.smile import Smile
 from plugwise.stick import Stick

plugwise/helper.py

@@ -480,7 +480,7 @@ def _appliance_info_finder(self, appliance: etree, appl: Munch) -> Munch:
             appl.model = appl.name = self.smile_name
             appl.v_name = "Plugwise B.V."
 
-            # Adam: check for ZigBee mac address
+            # Adam: look for the ZigBee MAC address of the Smile
             if self.smile_name == "Adam" and (
                 found := self._modules.find(".//protocols/zig_bee_coordinator")
             ):
@@ -700,15 +700,13 @@ def _match_locations(self) -> dict[str, Any]:
 
     def _control_state(self, loc_id: str) -> str | None:
         """Helper-function for _device_data_adam().
-        Adam: find the thermostat control_state of a location, from LOCATIONS.
+        Adam: find the thermostat control_state of a location, from DOMAIN_OBJECTS.
         Represents the heating/cooling demand-state of the local master thermostat.
         Note: heating or cooling can still be active when the setpoint has been reached.
         """
         locator = f'location[@id="{loc_id}"]'
-        if (location := self._locations.find(locator)) is not None:
-            locator = (
-                ".//actuator_functionalities/thermostat_functionality/control_state"
-            )
+        if (location := self._domain_objects.find(locator)) is not None:
+            locator = './/actuator_functionalities/thermostat_functionality[type="thermostat"]/control_state'
             if (ctrl_state := location.find(locator)) is not None:
                 return ctrl_state.text
 
@@ -1085,7 +1083,7 @@ def _power_data_peak_value(self, loc: str) -> Munch:
 
     def _power_data_from_location(self, loc_id: str) -> dict[str, Any] | None:
         """Helper-function for smile.py: _get_device_data().
-        Collect the power-data based on Location ID.
+        Collect the power-data based on Location ID, from LOCATIONS.
         """
         direct_data: dict[str, any] = {}
         loc = Munch()
@@ -1250,10 +1248,10 @@ def _last_used_schedule(self, loc_id: str, rule_ids: dict[str]) -> str | None:
 
     def _object_value(self, obj_id: str, measurement: str) -> float | int | bool | None:
         """Helper-function for smile.py: _get_device_data() and _device_data_anna().
-        Obtain the value/state for the given object.
+        Obtain the value/state for the given object from DOMAIN_OBJECTS.
         """
         val: float | int | None = None
-        search = self._locations
+        search = self._domain_objects
         locator = (
             f'.//location[@id="{obj_id}"]/logs/point_log'
             f'[type="{measurement}"]/period/measurement'

plugwise/smile.py

@@ -274,9 +274,10 @@ async def _smile_detect_legacy(
         self, result: etree, dsmrmain: etree
     ) -> tuple[str, str]:
         """Helper-function for _smile_detect()."""
+        # Stretch: find the MAC of the zigbee master_controller (= Stick)
         if network := result.find(".//module/protocols/master_controller"):
             self.smile_zigbee_mac_address = network.find("mac_address").text
-        # Stretch: check for orphaned Sticks
+        # Find the active MAC in case there is an orphaned Stick
         if zb_networks := result.findall(".//network"):
             for zb_network in zb_networks:
                 if zb_network.find(".//nodes/network_router"):
@@ -332,13 +333,11 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None:
         """
         model: str | None = None
         if (gateway := result.find(".//gateway")) is not None:
-            model = result.find(".//gateway/vendor_model").text
-            self.smile_fw_version = result.find(".//gateway/firmware_version").text
-            self.smile_hw_version = result.find(".//gateway/hardware_version").text
-            if gateway.find("hostname") is not None:
-                self.smile_hostname = gateway.find("hostname").text
-            if gateway.find("mac_address") is not None:
-                self.smile_mac_address = gateway.find("mac_address").text
+            model = gateway.find("vendor_model").text
+            self.smile_fw_version = 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)
 
@@ -397,8 +396,7 @@ async def _update_domain_objects(self) -> None:
 
         # If Plugwise notifications present:
         self._notifications = {}
-        notifications: etree = self._domain_objects.findall(".//notification")
-        for notification in notifications:
+        for notification in self._domain_objects.findall(".//notification"):
             try:
                 msg_id = notification.attrib["id"]
                 msg_type = notification.find("type").text

tests/test_smile.py

@@ -2188,7 +2188,7 @@ async def test_connect_anna_heatpump_cooling(self):
             },
             # Gateway
             "015ae9ea3f964e668e490fa39da3870b": {
-                "sensors": {"outdoor_temperature": 20.2}
+                "sensors": {"outdoor_temperature": 22.0}
             },
         }