Try

Author: bouwew

plugwise_usb/nodes/helpers/pulses.py

@@ -184,15 +184,39 @@ def collected_pulses(
         log_pulses = result[0]
         reset = result[1]
         pulses: int | None = None
-        delta_cons_pulses: int = 0
-        delta_prod_pulses: int = 0
         timestamp: datetime | None = None
         if is_consumption and self._pulses_consumption is not None:
             timestamp = self._pulses_timestamp
-            #if self._prev_timestamp == timestamp:
-            #    _LOGGER.debug("collected_pulses | %s | double timestamp=%s", self._mac, timestamp)
-            #    return (None, None)
+            if from_timestamp != timestamp:
+                if is_consumption and self._pulses_consumption is not None:
+                    pulses = self._pulses_consumption
+                    timestamp = self._pulses_timestamp
+                if not is_consumption and self._pulses_production is not None:
+                    pulses = self._pulses_production
+                    timestamp = self._pulses_timestamp
+
+                if pulses is None:
+                    _LOGGER.debug(
+                        "collected_pulses | %s | is_consumption=%s, pulses=None",
+                        self._mac,
+                        is_consumption,
+                    )
+                    return (None, None)
 
+                _LOGGER.debug(
+                    "collected_pulses | pulses=%s | log_pulses=%s | consumption=%s from %s to %s",
+                    pulses,
+                    log_pulses,
+                    is_consumption,
+                    from_timestamp,
+                    timestamp,
+                )
+
+                # Always return positive values of energy_statistics
+                return (abs(pulses + log_pulses), timestamp)
+
+            delta_cons_pulses: int = 0
+            delta_prod_pulses: int = 0
             delta_cons_pulses = self._pulses_consumption - self._prev_pulses_consumption
             pulses = self._prev_pulses_consumption + delta_cons_pulses
             self._prev_pulses_consumption = pulses