Merge pull request #274 from plugwise/fix_plus_energy_reset

Let PlugwiseCirclePlus class load NodeFeature.CIRCLE too

Author: bouwew

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## v0.44.4
+## v0.44.5 - 2025-06-22
+
+- PR [274](https://github.com/plugwise/python-plugwise-usb/pull/274): Make the energy-reset function available to Plus devices
+
+## v0.44.4 - 2025-06-21
 
 - PR [#255](https://github.com/plugwise/python-plugwise-usb/pull/255): Improve enery-logs reset process, enable use of a button in Plugwise_usb beta
 - PR [#261](https://github.com/plugwise/python-plugwise-usb/pull/261): Sense: bugfix parsing of humidity value as an unsigned int

plugwise_usb/nodes/circle_plus.py

@@ -19,6 +19,15 @@
 
 _LOGGER = logging.getLogger(__name__)
 
+FEATURES_CIRCLE_PLUS = (
+    NodeFeature.RELAY,
+    NodeFeature.RELAY_INIT,
+    NodeFeature.RELAY_LOCK,
+    NodeFeature.ENERGY,
+    NodeFeature.POWER,
+    NodeFeature.CIRCLE,
+    NodeFeature.CIRCLEPLUS,
+)
 
 class PlugwiseCirclePlus(PlugwiseCircle):
     """Plugwise Circle+ node."""
@@ -31,20 +40,11 @@ async def load(self) -> bool:
             _LOGGER.debug("Loading Circle node %s from cache", self._node_info.mac)
             if await self._load_from_cache():
                 self._loaded = True
-                self._setup_protocol(
-                    CIRCLE_PLUS_FIRMWARE_SUPPORT,
-                    (
-                        NodeFeature.RELAY,
-                        NodeFeature.RELAY_INIT,
-                        NodeFeature.RELAY_LOCK,
-                        NodeFeature.ENERGY,
-                        NodeFeature.POWER,
-                        NodeFeature.CIRCLEPLUS,
-                    ),
-                )
+                self._setup_protocol(CIRCLE_PLUS_FIRMWARE_SUPPORT, FEATURES_CIRCLE_PLUS)
                 if await self.initialize():
                     await self._loaded_callback(NodeEvent.LOADED, self.mac)
                     return True
+
             _LOGGER.info(
                 "Loading Circle+ node %s from cache failed",
                 self._node_info.mac,
@@ -67,20 +67,12 @@ async def load(self) -> bool:
                 self._node_info.mac,
             )
             return False
+
         self._loaded = True
-        self._setup_protocol(
-            CIRCLE_PLUS_FIRMWARE_SUPPORT,
-            (
-                NodeFeature.RELAY,
-                NodeFeature.RELAY_INIT,
-                NodeFeature.RELAY_LOCK,
-                NodeFeature.ENERGY,
-                NodeFeature.POWER,
-                NodeFeature.CIRCLEPLUS,
-            ),
-        )
+        self._setup_protocol(CIRCLE_PLUS_FIRMWARE_SUPPORT, FEATURES_CIRCLE_PLUS)
         if not await self.initialize():
             return False
+
         await self._loaded_callback(NodeEvent.LOADED, self.mac)
         return True
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise_usb"
-version         = "0.44.4"
+version         = "0.44.5"
 license         = "MIT"
 keywords        = ["home", "automation", "plugwise", "module", "usb"]
 classifiers     = [

tests/test_usb.py

@@ -2484,6 +2484,7 @@ async def test_node_discovery_and_load(  # noqa: PLR0915
         assert sorted(state[pw_api.NodeFeature.INFO].features) == sorted(
             (
                 pw_api.NodeFeature.AVAILABLE,
+                pw_api.NodeFeature.CIRCLE,
                 pw_api.NodeFeature.CIRCLEPLUS,
                 pw_api.NodeFeature.INFO,
                 pw_api.NodeFeature.PING,