X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/d2eb6d9bcf3610d89238f567b5a50f801bcf61dc..6f86540f4d920706ed21ed5ecd6729791650507c:/widgets/bat.lua diff --git a/widgets/bat.lua b/widgets/bat.lua index c5279bd..2906de2 100644 --- a/widgets/bat.lua +++ b/widgets/bat.lua @@ -73,11 +73,27 @@ local function worker(args) end local hrs = math.floor(time_rat) + if hrs < 0 then hrs = 0 elseif hrs > 23 then hrs = 23 end + local min = math.floor((time_rat - hrs) * 60) + if min < 0 then min = 0 elseif min > 59 then min = 59 end bat_now.time = string.format("%02d:%02d", hrs, min) - bat_now.perc = string.format("%d", (rem / tot) * 100) - bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12) + + local perc = (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 + bat_now.watt = "N/A" + end -- notifications for low and critical states if bat_now.status == "Discharging"