plugwise 1.7.8a1__py3-none-any.whl → 1.8.0__py3-none-any.whl

plugwise/common.py

@@ -145,8 +145,8 @@ class SmileCommon:
             "model": appl.model,
             "model_id": appl.model_id,
             "name": appl.name,
-            "zigbee_mac_address": appl.zigbee_mac,
             "vendor": appl.vendor_name,
+            "zigbee_mac_address": appl.zigbee_mac,
         }.items():
             if value is not None or key == "location":
                 appl_key = cast(ApplianceType, key)
@@ -205,7 +205,7 @@ class SmileCommon:
                     "members": members,
                     "vendor": "Plugwise",
                 }
-                self._count += 4
+                self._count += 5
 
         return switch_groups
 

plugwise/constants.py

@@ -50,6 +50,7 @@ HW_MODELS: Final[dict[str, str]] = {
     "158-01": "Lisa",
     "160-01": "Plug",
     "168-01": "Jip",
+    "170-01": "Emma",
     "038500": "Stick",
     "070085": "Stick",
     "120002": "Stick Legrand",
@@ -553,7 +554,7 @@ class GwEntityData(TypedDict, total=False):
     preset_modes: list[str] | None
     # Schedules:
     available_schedules: list[str]
-    select_schedule: str
+    select_schedule: str | None
 
     climate_mode: str
     # Extra for Adam Master Thermostats

plugwise/data.py

@@ -268,11 +268,13 @@ class SmileData(SmileHelper):
             data["active_preset"] = self._preset(loc_id)
 
         # Schedule
+        data["available_schedules"] = []
+        data["select_schedule"] = None
+        self._count += 2
         avail_schedules, sel_schedule = self._schedules(loc_id)
         if avail_schedules != [NONE]:
             data["available_schedules"] = avail_schedules
             data["select_schedule"] = sel_schedule
-            self._count += 2
 
         # Set HA climate HVACMode: auto, heat, heat_cool, cool and off
         data["climate_mode"] = "auto"

plugwise/helper.py

@@ -411,7 +411,8 @@ class SmileHelper(SmileCommon):
                     case "elga_status_code":
                         data["elga_status_code"] = int(appl_p_loc.text)
                     case "select_dhw_mode":
-                        data["select_dhw_mode"] = appl_p_loc.text
+                        if self._dhw_allowed_modes:
+                            data["select_dhw_mode"] = appl_p_loc.text
 
                 common_match_cases(measurement, attrs, appl_p_loc, data)
 
@@ -522,7 +523,7 @@ class SmileHelper(SmileCommon):
 
         Collect the requested gateway mode.
         """
-        if not (self.check_name(ADAM) and entity_id == self._gateway_id):
+        if not (entity_id == self._gateway_id and self.check_name(ADAM)):
             return None
 
         if (search := search_actuator_functionalities(appliance, key)) is not None:
@@ -535,29 +536,31 @@ class SmileHelper(SmileCommon):
     ) -> None:
         """Helper-function for _get_measurement_data().
 
-        Adam: collect the gateway regulation_mode.
+        Adam gateway: collect the gateway regulation_mode.
         """
         if (
             mode := self._get_actuator_mode(
                 appliance, entity_id, "regulation_mode_control_functionality"
             )
         ) is not None:
-            data["select_regulation_mode"] = mode
-            self._count += 1
+            # Below line needs to be here to set the boolean for both older and recent Adam firmware versions
             self._cooling_enabled = mode == "cooling"
+            if self._reg_allowed_modes:
+                data["select_regulation_mode"] = mode
+                self._count += 1
 
     def _get_gateway_mode(
         self, appliance: etree.Element, entity_id: str, data: GwEntityData
     ) -> None:
         """Helper-function for _get_measurement_data().
 
-        Adam: collect the gateway mode.
+        Adam gateway: collect the gateway mode.
         """
         if (
             mode := self._get_actuator_mode(
                 appliance, entity_id, "gateway_mode_control_functionality"
             )
-        ) is not None:
+        ) is not None and self._gw_allowed_modes:
             data["select_gateway_mode"] = mode
             self._count += 1
 
@@ -718,7 +721,7 @@ class SmileHelper(SmileCommon):
                     },
                     "vendor": "Plugwise",
                 }
-                self._count += 3
+                self._count += 5
 
     def _match_locations(self) -> dict[str, ThermoLoc]:
         """Helper-function for _scan_thermostats().

plugwise/legacy/data.py

@@ -67,11 +67,13 @@ class SmileLegacyData(SmileLegacyHelper):
             data["active_preset"] = self._preset()
 
         # Schedule
+        data["available_schedules"] = []
+        data["select_schedule"] = None
+        self._count += 2
         avail_schedules, sel_schedule = self._schedules()
         if avail_schedules != [NONE]:
             data["available_schedules"] = avail_schedules
             data["select_schedule"] = sel_schedule
-            self._count += 2
 
         # Set HA climate HVACMode: auto, heat
         data["climate_mode"] = "auto"
@@ -82,6 +84,7 @@ class SmileLegacyData(SmileLegacyHelper):
     def _get_anna_control_state(self, data: GwEntityData) -> None:
         """Set the thermostat control_state based on the opentherm/onoff device state."""
         data["control_state"] = "idle"
+        self._count += 1
         for entity in self.gw_entities.values():
             if entity["dev_class"] != "heater_central":
                 continue

{plugwise-1.7.8a1.dist-info → plugwise-1.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plugwise
-Version: 1.7.8a1
+Version: 1.8.0
 Summary: Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3.
 Author: Plugwise device owners
 Maintainer: bouwew, CoMPaTech
@@ -11,6 +11,7 @@ Keywords: home,automation,plugwise,module
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Home Automation
 Requires-Python: >=3.13
@@ -87,17 +88,17 @@ Module providing interfacing with the Plugwise devices:
 ### Smile
 
 - [x] Adam
-  - [x] Lisa
+  - [x] Emma (only tested as ZigBee device connected to Adam)
   - [x] Jip
-  - [x] Floor
-  - [x] Tom
+  - [x] Lisa
+  - [x] Tom/Floor
   - [x] Koen (a Koen always comes with a Plug, the Plug is the active part)
   - [x] Plug
   - [x] Aqara Plug
-- [x] Anna
-- [x] Smile P1
-- [x] Stretch
-- [ ] Some of the equipment mentioned in USB when in use via Stretch or Adam
+- [x] Anna (v1.8 and later firmware versions)
+- [ ] Anna P1
+- [x] Smile P1 (v2.0 and later firmware versions)
+- [x] Stretch (only with Circles, please help out with other devices)
 
 - [x] [Home-Assistant](https://home-assistant.io) via
   - [x] Native supporting networked Plugwise products

plugwise-1.8.0.dist-info/RECORD

@@ -0,0 +1,18 @@
+plugwise/__init__.py,sha256=tctQhmRTvr70Am9x5V1UZf_VtPlw6o2if1MlgMVGcYo,17408
+plugwise/common.py,sha256=PaTCpw_d5OoEHkN_TuS1KTiuL1nGgsrdgCxTATVtRCA,10084
+plugwise/constants.py,sha256=F0RDampMHTyQjvmNlUC87tt7JzH2kK77t547eyArHDs,16946
+plugwise/data.py,sha256=vtOot1JrgE7rHdt1pSnrh0BNAetcsPlTnoRD3SRD5lc,12571
+plugwise/exceptions.py,sha256=Ce-tO9uNsMB-8FP6VAxBvsHNJ-NIM9F0onUZOdZI4Ys,1110
+plugwise/helper.py,sha256=nVFD47K2aCSvlgmwJRYMLgP5gtgRLGrwhoe5GLHvNaw,39165
+plugwise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+plugwise/smile.py,sha256=hk_KTOzajekJvxi05g4sJoJ49YvlSLLUiNluvMUbKBM,20319
+plugwise/smilecomm.py,sha256=DRQ3toRNEf3oo_mej49fPJ47m5das-jvo-8GnIrSPzw,5208
+plugwise/util.py,sha256=rMcqfaB4dkQEZFJY-bBJISmlYgTnb6Ns3-Doxelf92Q,10689
+plugwise/legacy/data.py,sha256=Dsv7wq_J6W0iC7vXhY_CQm03U5tfJM4O7SfSlJDBRQs,3246
+plugwise/legacy/helper.py,sha256=vUuYX-vJErbVwGJu7On1ITDh8X8nzO8WoqN-whS9FJ4,16710
+plugwise/legacy/smile.py,sha256=RBfasiOrAXUWwvUqciO0xzel4VMNsY0Nzb44GHqDPpo,12837
+plugwise-1.8.0.dist-info/licenses/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
+plugwise-1.8.0.dist-info/METADATA,sha256=ukO3oUBIRcU9EIdYVMW2i8DRy20p7znw5d0PPZ1lpgs,8071
+plugwise-1.8.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+plugwise-1.8.0.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
+plugwise-1.8.0.dist-info/RECORD,,

plugwise-1.7.8a1.dist-info/RECORD

@@ -1,18 +0,0 @@
-plugwise/__init__.py,sha256=tctQhmRTvr70Am9x5V1UZf_VtPlw6o2if1MlgMVGcYo,17408
-plugwise/common.py,sha256=vP4DgD1_Sv5B-7MwSjiYn7xoke20oDWggQ3aY5W1Jeg,10084
-plugwise/constants.py,sha256=V7piQ9xOrJ8nDK-RBcMiodSX3L-vEgRwnWmmxyRZCX8,16917
-plugwise/data.py,sha256=ZS6Oo05R0vXksYwsReKQLGCoyQd8bo-hg8jGE2uMH-w,12495
-plugwise/exceptions.py,sha256=Ce-tO9uNsMB-8FP6VAxBvsHNJ-NIM9F0onUZOdZI4Ys,1110
-plugwise/helper.py,sha256=LmepTNlN_EtamwZ-ur8A-MWY04X4wG1ZPN-E1f9Y1W0,38908
-plugwise/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-plugwise/smile.py,sha256=hk_KTOzajekJvxi05g4sJoJ49YvlSLLUiNluvMUbKBM,20319
-plugwise/smilecomm.py,sha256=DRQ3toRNEf3oo_mej49fPJ47m5das-jvo-8GnIrSPzw,5208
-plugwise/util.py,sha256=rMcqfaB4dkQEZFJY-bBJISmlYgTnb6Ns3-Doxelf92Q,10689
-plugwise/legacy/data.py,sha256=Z-7nw21s9-L4DcwPCZ_yoRGeI_fWBS1Q48kHmyh2pkY,3145
-plugwise/legacy/helper.py,sha256=vUuYX-vJErbVwGJu7On1ITDh8X8nzO8WoqN-whS9FJ4,16710
-plugwise/legacy/smile.py,sha256=RBfasiOrAXUWwvUqciO0xzel4VMNsY0Nzb44GHqDPpo,12837
-plugwise-1.7.8a1.dist-info/licenses/LICENSE,sha256=mL22BjmXtg_wnoDnnaqps5_Bg_VGj_yHueX5lsKwbCc,1144
-plugwise-1.7.8a1.dist-info/METADATA,sha256=kR-ur5GLSxDBkMTOAubA-huu0g7QqUORD7Y0BEXFuAw,7905
-plugwise-1.7.8a1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-plugwise-1.7.8a1.dist-info/top_level.txt,sha256=MYOmktMFf8ZmX6_OE1y9MoCZFfY-L8DA0F2tA2IvE4s,9
-plugwise-1.7.8a1.dist-info/RECORD,,