Skip to content

Commit 16517a3

Browse files
committed
Fix
1 parent c86923a commit 16517a3

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

plugwise_usb/nodes/circle.py

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,9 @@ async def energy_update(self) -> EnergyStatistics | None: # noqa: PLR0911 PLR09
432432
# Retry with previous log address as Circle node pointer to self._current_log_address
433433
# could be rolled over while the last log is at previous address
434434
prev_log_address, _ = calc_log_address(self._current_log_address, 1, -4)
435-
result, slots_empty_prev = await self.energy_log_update(prev_log_address, save_cache=False)
435+
result, slots_empty_prev = await self.energy_log_update(
436+
prev_log_address, save_cache=False
437+
)
436438
if not result:
437439
_LOGGER.debug(
438440
"async_energy_update | %s | Log rollover | energy_log_update from address %s failed",
@@ -532,7 +534,7 @@ async def _get_initial_energy_logs(self) -> None:
532534
)
533535
break
534536

535-
any_updates |= (not slots_empty)
537+
any_updates |= not slots_empty
536538
log_address, _ = calc_log_address(log_address, 1, -4)
537539
total_addresses -= 1
538540

@@ -573,7 +575,7 @@ async def get_missing_energy_logs(self) -> None:
573575
await gather(*to_cancel, return_exceptions=True)
574576
break
575577

576-
any_updates |= (not slots_empty)
578+
any_updates |= not slots_empty
577579

578580
if self._cache_enabled and any_updates:
579581
await self.save_cache()
@@ -620,13 +622,18 @@ async def energy_log_update(
620622
"In slot=%s: pulses=%s, timestamp=%s", _slot, log_pulses, log_timestamp
621623
)
622624
address = response.log_address
623-
log_timestamp = log_timestamp.replace(tzinfo=UTC)
624625
if log_timestamp is None or log_pulses is None:
625626
self._energy_counters.add_empty_log(address, _slot)
626-
elif self._check_timestamp_is_recent(address, _slot, log_timestamp):
627-
self._energy_counters.add_pulse_log(
628-
address, _slot, log_timestamp, log_pulses, import_only=True,
629-
)
627+
else:
628+
log_timestamp = log_timestamp.replace(tzinfo=UTC)
629+
if self._check_timestamp_is_recent(address, _slot, log_timestamp):
630+
self._energy_counters.add_pulse_log(
631+
address,
632+
_slot,
633+
log_timestamp,
634+
log_pulses,
635+
import_only=True,
636+
)
630637
cache_updated = True
631638

632639
self._energy_counters.update()

0 commit comments

Comments
 (0)