fixing issue of battery widget showing above 100% percentage values

This commit is contained in:
aajjbb 2016-01-02 22:14:37 -02:00
parent 137e072153
commit fca030d084
1 changed files with 14 additions and 13 deletions

View File

@ -96,20 +96,21 @@ local function worker(args)
if min < 0 then min = 0 elseif min > 59 then min = 59 end if min < 0 then min = 0 elseif min > 59 then min = 59 end
bat_now.time = string.format("%02d:%02d", hrs, min) bat_now.time = string.format("%02d:%02d", hrs, min)
local perc = tonumber(first_line(bstr .. "/capacity"))
bat_now.perc = first_line(bstr .. "/capacity") if not perc then
perc = (rem / tot) * 100
if not bat_now.perc then end
local perc = (rem / tot) * 100
if perc <= 100 then if perc <= 100 then
bat_now.perc = string.format("%d", perc) bat_now.perc = string.format("%d", perc)
elseif perc > 100 then elseif perc > 100 then
bat_now.perc = "100" bat_now.perc = "100"
elseif perc < 0 then elseif perc < 0 then
bat_now.perc = "0" bat_now.perc = "0"
end end
end
if rate ~= nil and ratev ~= nil then if rate ~= nil and ratev ~= nil then
bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12) bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)
else else