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

Merge branch 'master' of https://github.com/copycat-killer/lain

This commit is contained in:
copycat-killer 2016-04-02 11:20:18 +02:00
parent 80075e34d5 da3310b775
commit bacf63807c
2 changed files with 99 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
widgets/alsa.lua
View File

@ -45,7 +45,6 @@ local function worker(args)
end end
timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel) timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel)
newtimer(timer_id, timeout, alsa.update) newtimer(timer_id, timeout, alsa.update)
return setmetatable(alsa, { __index = alsa.widget }) return setmetatable(alsa, { __index = alsa.widget })

72
widgets/bat.lua
View File

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