plugwise 1.7.8a1__tar.gz → 1.8.0__tar.gz

{plugwise-1.7.8a1 → plugwise-1.8.0}/PKG-INFO

@@ -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.7.8a1 → plugwise-1.8.0}/README.md

@@ -62,17 +62,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.7.8a1 → plugwise-1.8.0}/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-1.7.8a1 → plugwise-1.8.0}/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-1.7.8a1 → plugwise-1.8.0}/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-1.7.8a1 → plugwise-1.8.0}/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-1.7.8a1 → plugwise-1.8.0}/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 → plugwise-1.8.0}/plugwise.egg-info/PKG-INFO

@@ -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.7.8a1 → plugwise-1.8.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise"
-version         = "1.7.8a1"
+version         = "1.8.0"
 license         = "MIT"
 description     = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3."
 readme          = "README.md"
@@ -13,6 +13,7 @@ classifiers     = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: 3.13",
     "Topic :: Home Automation",
 ]
@@ -56,7 +57,7 @@ include = ["plugwise*"]
 ##
 
 [tool.pylint.MAIN]
-py-version = "3.13"
+py-version = "3.14"
 # Use a conservative default here; 2 should speed up most setups and not hurt
 # any too bad. Override on command line as appropriate.
 jobs = 2
@@ -391,7 +392,7 @@ max-line-length-suggestions = 72
 
 
 [tool.mypy]
-python_version = "3.13"
+python_version = "3.14"
 show_error_codes = true
 follow_imports = "silent"
 ignore_missing_imports = true
@@ -421,7 +422,7 @@ omit= [
 ]
 
 [tool.ruff]
-target-version = "py313"
+target-version = "py314"
 
 lint.select = [
     "B002", # Python does not support the unary prefix increment

{plugwise-1.7.8a1 → plugwise-1.8.0}/tests/test_adam.py

@@ -36,7 +36,7 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         assert api.gateway_id == "da224107914542988a88561b4452b0f6"
         assert api._last_active["f2bf9048bef64cc5b6d5110154e33c81"] == "Weekschema"
         assert api._last_active["f871b8c4d63549319221e294e4f88074"] == "Badkamer"
-        assert self.entity_items == 178
+        assert self.entity_items == 183
         assert self.entity_list == [
             "da224107914542988a88561b4452b0f6",
             "056ee145a816487eaa69243c3280f8bf",
@@ -181,6 +181,28 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         await api.close_connection()
         await self.disconnect(server, client)
 
+    @pytest.mark.asyncio
+    async def test_connect_adam_anna_new_2(self):
+        """Test extended Adam (firmware 3.9) with Emma setup."""
+        self.smile_setup = "adam_anna_new_2"
+
+        testdata = await self.load_testdata(SMILE_TYPE, self.smile_setup)
+        server, api, client = await self.connect_wrapper()
+        assert api.smile.hostname == "smile000000"
+
+        self.validate_test_basics(
+            _LOGGER,
+            api,
+            smile_type=None,
+            smile_version="3.9.0",
+        )
+
+        await self.device_test(api, "2025-10-12 00:00:01", testdata)
+        assert self.entity_items == 195
+
+        await api.close_connection()
+        await self.disconnect(server, client)
+
     @pytest.mark.asyncio
     async def test_connect_adam_plus_anna_new_regulation_off(self):
         """Test regultaion_mode off with control_state key missing for Adam."""
@@ -217,7 +239,7 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         assert api._last_active["82fa13f017d240daa0d0ea1775420f24"] == CV_JESSIE
         assert api._last_active["08963fec7c53423ca5680aa4cb502c63"] == BADKAMER_SCHEMA
         assert api._last_active["446ac08dd04d4eff8ac57489757b7314"] == BADKAMER_SCHEMA
-        assert self.entity_items == 370
+        assert self.entity_items == 379
 
         assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
         await api.delete_notification()
@@ -295,7 +317,7 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         assert api._last_active["82fa13f017d240daa0d0ea1775420f24"] == CV_JESSIE
         assert api._last_active["08963fec7c53423ca5680aa4cb502c63"] == BADKAMER_SCHEMA
         assert api._last_active["446ac08dd04d4eff8ac57489757b7314"] == BADKAMER_SCHEMA
-        assert self.entity_items == 375
+        assert self.entity_items == 385
 
         assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
 
@@ -341,7 +363,7 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         assert api._last_active["a562019b0b1f47a4bde8ebe3dbe3e8a9"] == WERKDAG_SCHEMA
         assert api._last_active["8cf650a4c10c44819e426bed406aec34"] == WERKDAG_SCHEMA
         assert api._last_active["5cc21042f87f4b4c94ccb5537c47a53f"] == WERKDAG_SCHEMA
-        assert self.entity_items == 498
+        assert self.entity_items == 518
         assert self.cooling_present
         assert self._cooling_enabled
 
@@ -364,7 +386,7 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         )
 
         await self.device_test(api, "2022-01-02 00:00:01", testdata)
-        assert self.entity_items == 65
+        assert self.entity_items == 67
         assert self.cooling_present
         # assert self._cooling_enabled - no cooling_enabled indication present
 
@@ -389,7 +411,7 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         await self.device_test(api, "2020-03-22 00:00:01", testdata)
         assert api.gateway_id == "b128b4bbbd1f47e9bf4d756e8fb5ee94"
         assert api._last_active["009490cc2f674ce6b576863fbb64f867"] == "Weekschema"
-        assert self.entity_items == 81
+        assert self.entity_items == 82
         assert "6fb89e35caeb4b1cb275184895202d84" in self.notifications
 
         result = await self.tinker_thermostat(
@@ -433,7 +455,7 @@ class TestPlugwiseAdam(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         assert api._last_active["06aecb3d00354375924f50c47af36bd2"] is None
         assert api._last_active["d27aede973b54be484f6842d1b2802ad"] is None
         assert api._last_active["13228dab8ce04617af318a2888b3c548"] is None
-        assert self.entity_items == 245
+        assert self.entity_items == 261
 
         # Negative test
         result = await self.tinker_thermostat(

{plugwise-1.7.8a1 → plugwise-1.8.0}/tests/test_legacy_anna.py

@@ -30,7 +30,7 @@ class TestPlugwiseAnna(TestPlugwise):  # pylint: disable=attribute-defined-outsi
 
         await self.device_test(api, "2020-03-22 00:00:01", testdata)
         assert api.gateway_id == "0000aaaa0000aaaa0000aaaa0000aa00"
-        assert self.entity_items == 41
+        assert self.entity_items == 44
         assert not api.reboot
 
         result = await self.tinker_legacy_thermostat(api, schedule_on=False)
@@ -65,7 +65,7 @@ class TestPlugwiseAnna(TestPlugwise):  # pylint: disable=attribute-defined-outsi
         await self.device_test(api, "2020-05-03 00:00:01", testdata)
 
         assert api.gateway_id == "be81e3f8275b4129852c4d8d550ae2eb"
-        assert self.entity_items == 43
+        assert self.entity_items == 44
 
         result = await self.tinker_legacy_thermostat(api)
         assert result

{plugwise-1.7.8a1 → plugwise-1.8.0}/tests/test_legacy_stretch.py

@@ -29,7 +29,7 @@ class TestPlugwiseStretch(TestPlugwise):  # pylint: disable=attribute-defined-ou
 
         await self.device_test(api, "2022-05-16 00:00:01", testdata)
         assert api.gateway_id == "0000aaaa0000aaaa0000aaaa0000aa00"
-        assert self.entity_items == 83
+        assert self.entity_items == 85
 
         switch_change = await self.tinker_switch(
             api,
@@ -68,7 +68,7 @@ class TestPlugwiseStretch(TestPlugwise):  # pylint: disable=attribute-defined-ou
         )
 
         await self.device_test(api, "2022-05-16 00:00:01", testdata)
-        assert self.entity_items == 243
+        assert self.entity_items == 244
 
         switch_change = await self.tinker_switch(
             api, "2587a7fcdd7e482dab03fda256076b4b"