Merge pull request #297 from plugwise/spikes

Fix spikes in Energy graphs

Author: bouwew

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## ONGOING
 
+- Fix for [#291](https://github.com/plugwise/plugwise_usb-beta/issues/291) via PR [297](https://github.com/plugwise/python-plugwise-usb/pull/297)
 - PR [295](https://github.com/plugwise/python-plugwise-usb/pull/295): Streamline of loading function, to allow nodes to load even if temporarily offline, especially for SED nodes.
 
 ## v0.44.8

plugwise_usb/nodes/circle.py

@@ -1231,6 +1231,11 @@ async def get_state(self, features: tuple[NodeFeature]) -> dict[NodeFeature, Any
                     f"Update of feature '{feature}' is not supported for {self.name}"
                 )
 
+        features, states = await self._check_for_energy_and_power_features(
+            features, states
+        )
+
+        for feature in features:
             match feature:
                 case NodeFeature.ENERGY:
                     states[feature] = await self.energy_update()
@@ -1266,6 +1271,33 @@ async def get_state(self, features: tuple[NodeFeature]) -> dict[NodeFeature, Any
 
         return states
 
+    async def _check_for_energy_and_power_features(
+        self, features: tuple[NodeFeature], states: dict[NodeFeature, Any]
+    ) -> tuple[tuple[NodeFeature], dict[NodeFeature, Any]]:
+        """Check for presence of both NodeFeature.ENERGY and NodeFeature.POWER.
+
+        If both are present, execute the related functions in a specific order
+        to assure a proper response to the hourly pulses-rollovers.
+        """
+        if {NodeFeature.ENERGY, NodeFeature.POWER} <= set(features):
+            states[NodeFeature.POWER] = await self.power_update()
+            _LOGGER.debug(
+                "async_get_state %s - power: %s",
+                self._mac_in_str,
+                states[NodeFeature.POWER],
+            )
+            states[NodeFeature.ENERGY] = await self.energy_update()
+            _LOGGER.debug(
+                "async_get_state %s - energy: %s",
+                self._mac_in_str,
+                states[NodeFeature.ENERGY],
+            )
+            return tuple(
+                set(features).difference({NodeFeature.ENERGY, NodeFeature.POWER})
+            ), states
+
+        return features, states
+
     async def energy_reset_request(self) -> None:
         """Send an energy-reset to a Node."""
         if self._node_protocols is None: