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

Merge branch 'patch-3' of https://github.com/andering/lain into andering-patch-3

This commit is contained in:
Luke Bonham 2016-03-31 11:44:33 +02:00
parent 2967318ea5 fcbb371e56
commit 63455361db
1 changed files with 101 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
widgets/bat.lua
View File

@ -59,57 +59,56 @@ local function worker(args)
}
local bstr = "/sys/class/power_supply/" .. battery
local astr = "/sys/class/power_supply/" .. ac
local present = first_line(bstr .. "/present")
if present == "1"
then
local ratep = tonumber(first_line(bstr .. "/power_now"))
local ratec = tonumber(first_line(bstr .. "/current_now"))
local ratev = tonumber(first_line(bstr .. "/voltage_now"))
-- current_now(I)[uA], voltage_now(U)[uV], power_now(P)[uW]
local rate_current = tonumber(first_line(bstr .. "/current_now"))
local rate_voltage = tonumber(first_line(bstr .. "/voltage_now"))
local rate_power = tonumber(first_line(bstr .. "/power_now"))
local rem = tonumber(first_line(bstr .. "/energy_now") or
-- energy_now(P)[uWh], charge_now(I)[uAh]
local energy_now = tonumber(first_line(bstr .. "/energy_now") or
first_line(bstr .. "/charge_now"))
local tot = tonumber(first_line(bstr .. "/energy_full") or
-- energy_full(P)[uWh], charge_full(I)[uAh],
local energy_full = tonumber(first_line(bstr .. "/energy_full") or
first_line(bstr .. "/charge_full"))
bat_now.status = first_line(bstr .. "/status") or "N/A"
bat_now.ac_status = first_line(string.format("/sys/class/power_supply/%s/online", ac)) or "N/A"
local time_rat = 0
local energy_percentage = tonumber(first_line(bstr .. "/capacity")) or
math.floor((energy_now / energy_full) * 100)
bat_now.status = first_line(bstr .. "/status") or "N/A"
bat_now.ac_status = first_line(astr .. "/online") or "N/A"
-- if rate = 0 or rate not defined skip the round
if not (rate_power and rate_power > 0) and
not (rate_current and rate_current > 0) and
not (bat_now.status == "Full")
then
return
end
local rate_time = 0
if bat_now.status == "Charging"
then
time_rat = (tot - rem) / (ratep or ratec)
rate_time = (energy_full - energy_now) / rate_power or rate_current
elseif bat_now.status == "Discharging"
then
time_rat = rem / (ratep or ratec)
rate_time = energy_now / rate_power or rate_current
end
local hrs = math.floor(time_rat)
if hrs < 0 then hrs = 0 elseif hrs > 23 then hrs = 23 end
local hours = math.floor(rate_time)
local minutes = math.floor((rate_time - hours) * 60)
local min = math.floor((time_rat - hrs) * 60)
if min < 0 then min = 0 elseif min > 59 then min = 59 end
bat_now.perc = string.format("%d", energy_percentage)
bat_now.time = string.format("%02d:%02d", hours, minutes)
bat_now.watt = string.format("%.2fW", rate_power / 1e6 or (rate_voltage * rate_current) / 1e12)
bat_now.time = string.format("%02d:%02d", hrs, min)
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 ratep then
bat_now.watt = string.format("%.2fW", ratep)
else
bat_now.watt = string.format("%.2fW", (ratev * ratec) / 1e12)
end
end
widget = bat.widget
settings()