Merge pull request #138 from plugwise/energyloop

fix midnight rollover

Author: bouwew

plugwise_usb/nodes/circle.py

@@ -76,6 +76,7 @@ def __init__(self, mac, address, message_sender):
         self._energy_last_collected_count = 0
         self._energy_ratelimit_collection_timestamp = datetime.utcnow()
         self._energy_last_rollover_timestamp = datetime.utcnow()
+        self._energy_pulses_midnight_rollover = datetime.utcnow()
         self._energy_last_local_hour = datetime.now().hour
         self._energy_last_populated_slot = 0
         self._energy_pulses_current_hour = None
@@ -483,33 +484,49 @@ def _update_energy_today_now(self):
                 + self._energy_pulses_current_hour
             )
 
+        _utc_hour_timestamp = datetime.utcnow().replace(
+                minute=0, second=0, microsecond=0
+        )
+        _local_hour = datetime.now().hour
+        _utc_midnight_timestamp = _utc_hour_timestamp - timedelta(hours=_local_hour)
+        _local_midnight_timestamp = datetime.now().replace(
+            hour=0, minute=0, second=0, microsecond=0
+        )
+
         if _pulses_today_now is None:
             if self._energy_pulses_today_hourly is None:
-                _utc_hour_timestamp = datetime.utcnow().replace(
-                        minute=0, second=0, microsecond=0
-                )
-                _local_hour = datetime.now().hour
-                _utc_midnight_timestamp = _utc_hour_timestamp - timedelta(hours=_local_hour)
                 self._update_energy_today_hourly(
                     _utc_midnight_timestamp + timedelta(hours=1),
                     _utc_hour_timestamp,
                 )
         elif (
              self._energy_pulses_today_now is not None
              and self._energy_pulses_today_now > _pulses_today_now
-             and int((self._energy_pulses_today_now-_pulses_today_now)/self._energy_pulses_today_now*100) > 1
+             and self._energy_pulses_midnight_rollover < _local_midnight_timestamp
         ):
             _LOGGER.info(
-                "_update_energy_today_now for %s hour rollover started old=%s, new=%s",
+                "_update_energy_today_now for %s midnight rollover started old=%s, new=%s",
                 str(self.mac),
                 str(self._energy_pulses_today_now),
                 str(_pulses_today_now),
             )
-            _utc_hour_timestamp = datetime.utcnow().replace(
-                    minute=0, second=0, microsecond=0
+            self._energy_pulses_today_now = 0
+            self._energy_pulses_midnight_rollover = _local_midnight_timestamp
+            self._update_energy_today_hourly(
+                _utc_midnight_timestamp + timedelta(hours=1),
+                _utc_hour_timestamp,
+            )
+        elif (
+             self._energy_pulses_today_now is not None
+             and self._energy_pulses_today_now > _pulses_today_now
+             and int((self._energy_pulses_today_now-_pulses_today_now)/(self._energy_pulses_today_now+1)*100) > 1
+        ):
+            _LOGGER.info(
+                "_update_energy_today_now for %s hour rollover started old=%s, new=%s",
+                str(self.mac),
+                str(self._energy_pulses_today_now),
+                str(_pulses_today_now),
             )
-            _local_hour = datetime.now().hour
-            _utc_midnight_timestamp = _utc_hour_timestamp - timedelta(hours=_local_hour)
             self._update_energy_today_hourly(
                 _utc_midnight_timestamp + timedelta(hours=1),
                 _utc_hour_timestamp,

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise_usb"
-version         = "0.31.2b7"
+version         = "0.31.2b8"
 license         = {file = "LICENSE"}
 description     = "Plugwise USB (Stick) module for Python 3."
 readme          = "README.md"