awesomewm-mirrors
/
lain
mirror of https://github.com/lcpz/lain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

clean failed rebase and repatch #160 2

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

25
widgets/bat.lua
View File

@ -96,21 +96,18 @@ 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"))
if not perc then local perc = first_line(bstr .. "/capacity") or (rem / tot) * 100
perc = (rem / tot) * 100
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
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