bat: fix issue #17

This commit is contained in:
luke bonham 2013-10-06 21:16:25 +02:00 committed by copycat-killer
parent 09c71d8ee6
commit f8b37d5088
2 changed files with 16 additions and 3 deletions

View File

@ -3,7 +3,7 @@
Licensed under GNU General Public License v2 Licensed under GNU General Public License v2
* (c) 2013, Luke Bonham * (c) 2013, Luke Bonham
* (c) 2012, Nicolas Estibals * (c) 2010, Nicolas Estibals
* (c) 2010-2012, Peter Hofmann * (c) 2010-2012, Peter Hofmann
--]] --]]

View File

@ -79,8 +79,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)
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_not.watt = "N/A"
end
-- notifications for low and critical states -- notifications for low and critical states
if bat_now.status == "Discharging" if bat_now.status == "Discharging"