adam/lina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean failed rebase and repatch #160 2

Browse source
This commit is contained in:
copycat-killer 2016-01-03 11:35:10 +01:00
parent 0f1fe46d18
commit e966fd310e
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
widgets/bat.lua
View file

@ -97,19 +97,16 @@ local function worker(args)
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")) local perc = first_line(bstr .. "/capacity") or (rem / tot) * 100
if not perc then local perc = (rem / tot) * 100
perc = (rem / tot) * 100 if perc <= 100 then
end bat_now.perc = string.format("%d", perc)
elseif perc > 100 then
if perc <= 100 then bat_now.perc = "100"
bat_now.perc = string.format("%d", perc) elseif perc < 0 then
elseif perc > 100 then bat_now.perc = "0"
bat_now.perc = "100" end
elseif perc < 0 then
bat_now.perc = "0"
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)