@@ -319,26 +319,27 @@ def request_power_buffer(self, log_address=None, callback=None):
319319 """Request power log of specified address"""
320320 if log_address is None :
321321 log_address = self ._last_log_address
322- if bool (self .power_history ):
323- # Only request last 2 power buffer logs
324- self .stick .send (
325- CirclePowerBufferRequest (self .mac , log_address - 1 ),
326- )
327- self .stick .send (
328- CirclePowerBufferRequest (self .mac , log_address ),
329- callback ,
330- )
331- else :
332- # Collect power history info of today and yesterday
333- # Each request contains 4 hours except last request
334- for req_log_address in range (log_address - 13 , log_address ):
322+ if log_address is not None :
323+ if bool (self .power_history ):
324+ # Only request last 2 power buffer logs
335325 self .stick .send (
336- CirclePowerBufferRequest (self .mac , req_log_address ),
326+ CirclePowerBufferRequest (self .mac , log_address - 1 ),
327+ )
328+ self .stick .send (
329+ CirclePowerBufferRequest (self .mac , log_address ),
330+ callback ,
331+ )
332+ else :
333+ # Collect power history info of today and yesterday
334+ # Each request contains 4 hours except last request
335+ for req_log_address in range (log_address - 13 , log_address ):
336+ self .stick .send (
337+ CirclePowerBufferRequest (self .mac , req_log_address ),
338+ )
339+ self .stick .send (
340+ CirclePowerBufferRequest (self .mac , log_address ),
341+ callback ,
337342 )
338- self .stick .send (
339- CirclePowerBufferRequest (self .mac , log_address ),
340- callback ,
341- )
342343
343344 def _response_power_buffer (self , message ):
344345 """returns information about historical power usage
0 commit comments