renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

getElapsedTimeSinceBoot: Honor times in suspend, too (#8983)

Browse Source
This commit is contained in:
zwim
2022-04-11 00:20:48 +02:00
committed by GitHub
parent 61cafab0e5
commit 0808560532
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/device/generic/powerd.lua
View File

@@ -216,7 +216,8 @@ function BasePowerD:getCapacity()
if UIManager then
now_btv = UIManager:getElapsedTimeSinceBoot()
else
now_btv = TimeVal:now() + self.device.total_standby_tv -- Add time the device was in standby
-- Add time the device was in standby and suspend
now_btv = TimeVal:now() + self.device.total_standby_tv + self.device.total_suspend_tv
end
if (now_btv - self.last_capacity_pull_time):tonumber() >= 60 then
@@ -236,7 +237,8 @@ function BasePowerD:getAuxCapacity()
if UIManager then
now_btv = UIManager:getElapsedTimeSinceBoot()
else
now_btv = TimeVal:now() + self.device.total_standby_tv -- Add time the device was in standby
-- Add time the device was in standby and suspend
now_btv = TimeVal:now() + self.device.total_standby_tv + self.device.total_suspend_tv
end
if (now_btv - self.last_aux_capacity_pull_time):tonumber() >= 60 then

4
frontend/ui/uimanager.lua
View File

@@ -1242,10 +1242,10 @@ function UIManager:getTime()
end
--[[--
Returns a TimeVal object corresponding to the last UI tick plus the time in standby.
Returns a TimeVal object corresponding to the last UI tick plus the time in standby and suspend.
]]
function UIManager:getElapsedTimeSinceBoot()
return self:getTime() + Device.total_standby_tv
return self:getTime() + Device.total_standby_tv + Device.total_suspend_tv
end
-- precedence of refresh modes: