@@ -288,25 +288,14 @@ def update(
288288 last_reset = last_reset .replace (minute = 0 , second = 0 , microsecond = 0 )
289289 if self ._energy_id in ENERGY_DAY_COUNTERS :
290290 # Sync the daily reset time with the device pulsecounter(s) reset time
291- if self ._is_consumption :
292- if self ._pulse_collection .consumption_last_hourly_reset is not None :
293- last_reset = last_reset .replace (
294- hour = 0 ,
295- minute = self ._pulse_collection .consumption_last_hourly_reset .minutes ,
296- second = self ._pulse_collection .consumption_last_hourly_reset .seconds ,
297- microsecond = self ._pulse_collection .consumption_last_hourly_reset .microseconds ,
298- )
299- else :
300- last_reset = last_reset .replace (hour = 0 , minute = 0 , second = 0 , microsecond = 0 )
301- elif self ._pulse_collection .production_last_hourly_reset is not None :
291+ last_reset = last_reset .replace (hour = 0 , minute = 0 , second = 0 , microsecond = 0 )
292+ if self ._pulse_collection .last_hourly_reset is not None :
302293 last_reset = last_reset .replace (
303294 hour = 0 ,
304- minute = self ._pulse_collection .production_last_hourly_reset .minutes ,
305- second = self ._pulse_collection .production_last_hourly_reset .seconds ,
306- microsecond = self ._pulse_collection .production_last_hourly_reset .microseconds ,
295+ minute = self ._pulse_collection .last_hourly_reset .minutes ,
296+ second = self ._pulse_collection .last_hourly_reset .seconds ,
297+ microsecond = self ._pulse_collection .last_hourly_reset .microseconds ,
307298 )
308- else :
309- last_reset = last_reset .replace (hour = 0 , minute = 0 , second = 0 , microsecond = 0 )
310299
311300 pulses , last_update = pulse_collection .collected_pulses (
312301 last_reset , self ._is_consumption
0 commit comments