Battery Stat: Fix remaining & per hour numbers (#8688)

regression from #8491
papered over in #8582
Fixes #8644 #8687

Root cause was util.secondsToClockDuration (called by duration) takes seconds and we were giving it hours as `Change per hour` needs hours
reviewable/pr8690/r1
yparitcher 2 years ago committed by GitHub
parent 87dbb9885e
commit 517dfa3549
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -47,24 +47,28 @@ function Usage:append(state)
self.time = self.time + os.difftime(curr.timestamp - state.timestamp)
end
function Usage:percentageRatePerHour()
function Usage:percentageRate()
if self.time == 0 then
return 0
else
return 3600 * self.percentage / self.time
return self.percentage / self.time
end
end
function Usage:percentageRatePerHour()
return self:percentageRate() / 3600
end
function Usage:remainingTime()
if self:percentageRatePerHour() == 0 then return "N/A" end
if self:percentageRate() == 0 then return "N/A" end
local curr = State:new()
return curr.percentage / self:percentageRatePerHour()
return curr.percentage / self:percentageRate()
end
function Usage:chargingTime()
if self:percentageRatePerHour() == 0 then return "N/A" end
if self:percentageRate() == 0 then return "N/A" end
local curr = State:new()
return math.abs(curr.percentage - 100) / self:percentageRatePerHour()
return math.abs(curr.percentage - 100) / self:percentageRate()
end
local function shorten(number)

Loading…
Cancel
Save