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

bat: #177 fix Watt computation 2

This commit is contained in:
Luke Bonham 2016-03-22 08:59:30 +01:00
parent 6ebe2d9e72
commit 15af359bea
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
widgets/bat.lua
View File

@ -63,26 +63,25 @@ local function worker(args)
if present == "1" if present == "1"
then then
local rate = first_line(bstr .. "/power_now") local rate = tonumber(first_line(bstr .. "/power_now"))
local current_now = false
local rate_alt = first_line(bstr .. "/current_now") if not rate then
rate = tonumber(first_line(bstr .. "/current_now"))
current_now = true
end
local ratev = first_line(bstr .. "/voltage_now") local ratev = tonumber(first_line(bstr .. "/voltage_now"))
local rem = first_line(bstr .. "/energy_now") or local rem = tonumber(first_line(bstr .. "/energy_now") or
first_line(bstr .. "/charge_now") first_line(bstr .. "/charge_now"))
local tot = first_line(bstr .. "/energy_full") or local tot = tonumber(first_line(bstr .. "/energy_full") or
first_line(bstr .. "/charge_full") first_line(bstr .. "/charge_full"))
bat_now.status = first_line(bstr .. "/status") or "N/A" bat_now.status = first_line(bstr .. "/status") or "N/A"
bat_now.ac = first_line(string.format("/sys/class/power_supply/%s/online", ac)) or "N/A" bat_now.ac = first_line(string.format("/sys/class/power_supply/%s/online", ac)) or "N/A"
rate = tonumber(rate)
ratev = tonumber(ratev)
rem = tonumber(rem)
tot = tonumber(tot)
local time_rat = 0 local time_rat = 0
if bat_now.status == "Charging" if bat_now.status == "Charging"
then then
@ -110,14 +109,11 @@ local function worker(args)
bat_now.perc = "0" bat_now.perc = "0"
end end
if rate and ratev then if current_now then
bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12) bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)
elseif rate_alt then
bat_now.watt = string.format("%.2fW", rate_alt)
else else
bat_now.watt = "N/A" bat_now.watt = string.format("%.2fW", rate)
end end
end end
widget = bat.widget widget = bat.widget