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

Merge pull request #181 from stwa/patch-5 

Fix for #177
This commit is contained in:
Luke Bonham 2016-03-22 18:44:49 +01:00
parent e5abb78443 8c8d2925a5
commit d1b36bb53c
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
widgets/bat.lua
View File

@ -63,14 +63,8 @@ local function worker(args)
if present == "1" if present == "1"
then then
local rate = tonumber(first_line(bstr .. "/power_now")) local ratep = tonumber(first_line(bstr .. "/power_now"))
local current_now = false local ratec = tonumber(first_line(bstr .. "/current_now"))
if not rate then
rate = tonumber(first_line(bstr .. "/current_now"))
current_now = true
end
local ratev = tonumber(first_line(bstr .. "/voltage_now")) local ratev = tonumber(first_line(bstr .. "/voltage_now"))
local rem = tonumber(first_line(bstr .. "/energy_now") or local rem = tonumber(first_line(bstr .. "/energy_now") or
@ -85,10 +79,10 @@ local function worker(args)
local time_rat = 0 local time_rat = 0
if bat_now.status == "Charging" if bat_now.status == "Charging"
then then
time_rat = (tot - rem) / rate time_rat = (tot - rem) / (ratep or ratec)
elseif bat_now.status == "Discharging" elseif bat_now.status == "Discharging"
then then
time_rat = rem / rate time_rat = rem / (ratep or ratec)
end end
local hrs = math.floor(time_rat) local hrs = math.floor(time_rat)
@ -109,10 +103,10 @@ local function worker(args)
bat_now.perc = "0" bat_now.perc = "0"
end end
if current_now then if ratep then
bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12) bat_now.watt = string.format("%.2fW", ratep)
else else
bat_now.watt = string.format("%.2fW", rate) bat_now.watt = string.format("%.2fW", (ratev * ratec) / 1e12)
end end
end end