plugwise 1.6.1__py3-none-any.whl → 1.6.2__py3-none-any.whl

plugwise/__init__.py

@@ -147,6 +147,7 @@ class Smile(SmileComm):
             self.smile_model_id,
             self.smile_name,
             self.smile_type,
+            self.smile_version,
             self._port,
             self._username,
          ) if not self.smile_legacy else SmileLegacyAPI(

plugwise/constants.py

@@ -196,6 +196,7 @@ ZONE_MEASUREMENTS: Final[dict[str, DATA | UOM]] = {
     "electricity_produced": UOM(POWER_WATT),
     "relay": UOM(NONE),
     "temperature": UOM(TEMP_CELSIUS),  # HA Core thermostat current_temperature
+    "thermostat": DATA("setpoint", TEMP_CELSIUS),  # HA Core thermostat setpoint
 }
 
 # Literals
@@ -566,7 +567,7 @@ class GwEntityData(TypedDict, total=False):
 
     climate_mode: str
     # Extra for Adam Master Thermostats
-    control_state: str | bool
+    control_state: str
 
     # Dict-types
     binary_sensors: SmileBinarySensors

plugwise/data.py

@@ -160,9 +160,16 @@ class SmileData(SmileHelper):
         """
         zone = self._zones[loc_id]
         data = self._get_zone_data(loc_id)
-        if ctrl_state := self._control_state(loc_id):
-            data["control_state"] = ctrl_state
-            self._count += 1
+        if ctrl_state := self._control_state(data, loc_id):
+            if str(ctrl_state) in ("cooling", "heating", "preheating"):
+                data["control_state"] = str(ctrl_state)
+                self._count += 1
+            if str(ctrl_state) == "off":
+                data["control_state"] = "idle"
+                self._count += 1
+
+        data["sensors"].pop("setpoint")  # remove, only used in _control_state()
+        self._count -= 1
 
         # Thermostat data (presets, temperatures etc)
         self._climate_data(loc_id, zone, data)

plugwise/helper.py

@@ -64,7 +64,7 @@ from dateutil import tz
 from dateutil.parser import parse
 from defusedxml import ElementTree as etree
 from munch import Munch
-from packaging.version import Version
+from packaging import version
 
 
 class SmileComm:
@@ -252,13 +252,14 @@ class SmileHelper(SmileCommon):
         self.gateway_id: str
         self.gw_data: GatewayData = {}
         self.gw_entities: dict[str, GwEntityData] = {}
-        self.smile_fw_version: Version | None
+        self.smile_fw_version: version.Version | None
         self.smile_hw_version: str | None
         self.smile_mac_address: str | None
         self.smile_model: str
         self.smile_model_id: str | None
         self.smile_name: str
         self.smile_type: str
+        self.smile_version: version.Version | None
         self.smile_zigbee_mac_address: str | None
         self.therms_with_offset_func: list[str] = []
         self._zones: dict[str, GwEntityData] = {}
@@ -917,7 +918,7 @@ class SmileHelper(SmileCommon):
             else:
                 thermo_loc["secondary"].append(appliance_id)
 
-    def _control_state(self, loc_id: str) -> str | bool:
+    def _control_state(self, data: GwEntityData, loc_id: str) -> str | bool:
         """Helper-function for _get_adam_data().
 
         Adam: find the thermostat control_state of a location, from DOMAIN_OBJECTS.
@@ -930,7 +931,20 @@ class SmileHelper(SmileCommon):
             if (ctrl_state := location.find(locator)) is not None:
                 return str(ctrl_state.text)
 
-        return False
+        # 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 is not None:
+            if self.smile_version >= version.parse("3.2.0"):
+                return "off"
+
+            # Older Adam firmware does not have the control_state xml-key
+            # Work around this by comparing the reported temperature and setpoint for a location
+            setpoint = data["sensors"]["setpoint"]
+            temperature = data["sensors"]["temperature"]
+            # No cooling available in older firmware
+            return "heating" if temperature < setpoint else "off"
+
+        return False  # pragma: no cover
 
     def _heating_valves(self) -> int | bool:
         """Helper-function for smile.py: _get_adam_data().

plugwise/smile.py

@@ -66,6 +66,7 @@ class SmileAPI(SmileData):
         smile_model_id: str | None,
         smile_name: str,
         smile_type: str,
+        smile_version: Version | None,
         port: int = DEFAULT_PORT,
         username: str = DEFAULT_USERNAME,
     ) -> None:
@@ -90,6 +91,7 @@ class SmileAPI(SmileData):
         self.smile_model_id = smile_model_id
         self.smile_name = smile_name
         self.smile_type = smile_type
+        self.smile_version = smile_version
         SmileData.__init__(self)
 
 

{plugwise-1.6.1.dist-info → plugwise-1.6.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plugwise
-Version: 1.6.1
+Version: 1.6.2
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Home-page: https://github.com/plugwise/python-plugwise
 Author: Plugwise device owners

plugwise-1.6.2.dist-info/RECORD

@@ -0,0 +1,17 @@
+plugwise/__init__.py,sha256=GzkiJTPI0vFUIjGcIlvL_KS1lIHad_cOIKzCXwY3Eaw,17183
+plugwise/common.py,sha256=vyiAbn5SJgcL5A9DYIj2ixHBbPO_6EFa16bK1VJ3In4,13040
+plugwise/constants.py,sha256=yTR9uxFyWi0S5-KDtUGbtMI3eb2dGC3ekMxvL8X0qEY,17203
+plugwise/data.py,sha256=08QqLDUlK5vR49AqNT_rnqO2FoDwg5vdL5ClWtamUvQ,11856
+plugwise/exceptions.py,sha256=Ce-tO9uNsMB-8FP6VAxBvsHNJ-NIM9F0onUZOdZI4Ys,1110
+plugwise/helper.py,sha256=e-qd5C0U_N_g3Yyu6Kmc6Kvp0gDv9E-CoPShRmMQNAo,45414
+plugwise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+plugwise/smile.py,sha256=rY2KsANuHXgs5X_NzLP5kJQXscFnrCjGxrzyRiNqD74,18933
+plugwise/util.py,sha256=kt7JNcrTQaLT3eW_fzO4YmGsZzRull2Ge_OmHKl-rHk,8054
+plugwise/legacy/data.py,sha256=wHNcRQ_qF4A1rUdxn-1MoW1Z1gUwLqOvYvIkN6tJ_sk,3088
+plugwise/legacy/helper.py,sha256=ARIJytJNFiIR5G7Bp75DIULqgt56m0pxUXy6Ze8Te-4,18173
+plugwise/legacy/smile.py,sha256=RCQ0kHQwmPjq_G3r6aCe75RIvJt339jilzqEKydNopo,11286
+plugwise-1.6.2.dist-info/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
+plugwise-1.6.2.dist-info/METADATA,sha256=uc4gSP0Z6oou5-kf8UsYQGe2mDqsWPTGvaJYqtXGUHE,9148
+plugwise-1.6.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+plugwise-1.6.2.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
+plugwise-1.6.2.dist-info/RECORD,,

plugwise-1.6.1.dist-info/RECORD

@@ -1,17 +0,0 @@
-plugwise/__init__.py,sha256=iMNBAFzwPGoCue0i3NrWekZKHFMJ5gzeStNGSR_L8F8,17151
-plugwise/common.py,sha256=vyiAbn5SJgcL5A9DYIj2ixHBbPO_6EFa16bK1VJ3In4,13040
-plugwise/constants.py,sha256=vVn407-iivZIZ1ZqwHsnWJ4KjK3PSFRFUhOfDl9Qn6E,17129
-plugwise/data.py,sha256=7av0Ditk_dW9L7Ojoj7xo4-pI4FHkh1KhkBsl2nmP9Q,11537
-plugwise/exceptions.py,sha256=Ce-tO9uNsMB-8FP6VAxBvsHNJ-NIM9F0onUZOdZI4Ys,1110
-plugwise/helper.py,sha256=R85dRvIgjjLx2q02iQXdW34HFl4ibS1-sJfadijBnxI,44604
-plugwise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-plugwise/smile.py,sha256=tDpoAkkdY8OATmCqAfR5M-rtEvV_L3iic_929dXJwOI,18851
-plugwise/util.py,sha256=kt7JNcrTQaLT3eW_fzO4YmGsZzRull2Ge_OmHKl-rHk,8054
-plugwise/legacy/data.py,sha256=wHNcRQ_qF4A1rUdxn-1MoW1Z1gUwLqOvYvIkN6tJ_sk,3088
-plugwise/legacy/helper.py,sha256=ARIJytJNFiIR5G7Bp75DIULqgt56m0pxUXy6Ze8Te-4,18173
-plugwise/legacy/smile.py,sha256=RCQ0kHQwmPjq_G3r6aCe75RIvJt339jilzqEKydNopo,11286
-plugwise-1.6.1.dist-info/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
-plugwise-1.6.1.dist-info/METADATA,sha256=U9kZpCeve8EIJpa6UHQnPzsppsbtTbXVkj9bRLenXjg,9148
-plugwise-1.6.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-plugwise-1.6.1.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
-plugwise-1.6.1.dist-info/RECORD,,