X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/0f1fe46d18837f032cefcd43d511ed57575ec431..42505f946ee6bac3f593c84e29a1bea923d07d02:/widgets/bat.lua?ds=sidebyside diff --git a/widgets/bat.lua b/widgets/bat.lua index 60bd71c..d55be17 100644 --- a/widgets/bat.lua +++ b/widgets/bat.lua @@ -96,21 +96,17 @@ local function worker(args) if min < 0 then min = 0 elseif min > 59 then min = 59 end bat_now.time = string.format("%02d:%02d", hrs, min) - - local perc = tonumber(first_line(bstr .. "/capacity")) - - if not perc then - perc = (rem / tot) * 100 - end - - if perc <= 100 then - bat_now.perc = string.format("%d", perc) - elseif perc > 100 then - bat_now.perc = "100" - elseif perc < 0 then - bat_now.perc = "0" - end - + + local perc = tonumber(first_line(bstr .. "/capacity")) or math.floor((rem / tot) * 100) + + if perc <= 100 then + bat_now.perc = string.format("%d", perc) + elseif perc > 100 then + bat_now.perc = "100" + elseif perc < 0 then + bat_now.perc = "0" + end + if rate ~= nil and ratev ~= nil then bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12) else