mirror of https://github.com/lcpz/lain.git
Merge branch 'master' of https://github.com/copycat-killer/lain
This commit is contained in:
copycat-killer
commit
bacf63807c
|
|
@ -7,15 +7,15 @@
|
|||
|
||||
--]]
|
||||
|
||||
local newtimer = require("lain.helpers").newtimer
|
||||
local read_pipe = require("lain.helpers").read_pipe
|
||||
local newtimer = require("lain.helpers").newtimer
|
||||
local read_pipe = require("lain.helpers").read_pipe
|
||||
|
||||
local wibox = require("wibox")
|
||||
local wibox = require("wibox")
|
||||
|
||||
local string = { match = string.match,
|
||||
format = string.format }
|
||||
local string = { match = string.match,
|
||||
format = string.format }
|
||||
|
||||
local setmetatable = setmetatable
|
||||
local setmetatable = setmetatable
|
||||
|
||||
-- ALSA volume
|
||||
-- lain.widgets.alsa
|
||||
|
|
@ -32,11 +32,11 @@ local function worker(args)
|
|||
|
||||
function alsa.update()
|
||||
mixer = read_pipe(string.format("%s get %s", alsa.cmd, alsa.channel))
|
||||
l, s = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
|
||||
l,s = string.match(mixer, "([%d]+)%%.*%[([%l]*)")
|
||||
|
||||
if alsa.last_level ~= l or alsa.last_status ~= s then
|
||||
volume_now = { level = l, status = s }
|
||||
alsa.last_level = l
|
||||
alsa.last_level = l
|
||||
alsa.last_status = s
|
||||
|
||||
widget = alsa.widget
|
||||
|
|
@ -45,7 +45,6 @@ local function worker(args)
|
|||
end
|
||||
|
||||
timer_id = string.format("alsa-%s-%s", alsa.cmd, alsa.channel)
|
||||
|
||||
newtimer(timer_id, timeout, alsa.update)
|
||||
|
||||
return setmetatable(alsa, { __index = alsa.widget })
|
||||
|
|
|
|||
188
widgets/bat.lua
188
widgets/bat.lua
|
|
@ -1,10 +1,10 @@
|
|||
|
||||
--[[
|
||||
|
||||
Licensed under GNU General Public License v2
|
||||
* (c) 2013, Luke Bonham
|
||||
* (c) 2010-2012, Peter Hofmann
|
||||
|
||||
|
||||
Licensed under GNU General Public License v2
|
||||
* (c) 2013, Luke Bonham
|
||||
* (c) 2010-2012, Peter Hofmann
|
||||
|
||||
--]]
|
||||
|
||||
local newtimer = require("lain.helpers").newtimer
|
||||
|
|
@ -23,119 +23,113 @@ local setmetatable = setmetatable
|
|||
-- lain.widgets.bat
|
||||
|
||||
local function worker(args)
|
||||
local bat = {}
|
||||
local args = args or {}
|
||||
local timeout = args.timeout or 30
|
||||
local battery = args.battery or "BAT0"
|
||||
local ac = args.ac or "AC0"
|
||||
local notify = args.notify or "on"
|
||||
local settings = args.settings or function() end
|
||||
local bat = {}
|
||||
local args = args or {}
|
||||
local timeout = args.timeout or 30
|
||||
local battery = args.battery or "BAT0"
|
||||
local ac = args.ac or "AC0"
|
||||
local notify = args.notify or "on"
|
||||
local settings = args.settings or function() end
|
||||
|
||||
bat.widget = wibox.widget.textbox('')
|
||||
bat.widget = wibox.widget.textbox('')
|
||||
|
||||
bat_notification_low_preset = {
|
||||
title = "Battery low",
|
||||
text = "Plug the cable!",
|
||||
timeout = 15,
|
||||
fg = "#202020",
|
||||
bg = "#CDCDCD"
|
||||
}
|
||||
bat_notification_low_preset = {
|
||||
title = "Battery low",
|
||||
text = "Plug the cable!",
|
||||
timeout = 15,
|
||||
fg = "#202020",
|
||||
bg = "#CDCDCD"
|
||||
}
|
||||
|
||||
bat_notification_critical_preset = {
|
||||
title = "Battery exhausted",
|
||||
text = "Shutdown imminent",
|
||||
timeout = 15,
|
||||
fg = "#000000",
|
||||
bg = "#FFFFFF"
|
||||
}
|
||||
bat_notification_critical_preset = {
|
||||
title = "Battery exhausted",
|
||||
text = "Shutdown imminent",
|
||||
timeout = 15,
|
||||
fg = "#000000",
|
||||
bg = "#FFFFFF"
|
||||
}
|
||||
|
||||
function update()
|
||||
bat_now = {
|
||||
status = "Not present",
|
||||
ac_status = "N/A",
|
||||
perc = "N/A",
|
||||
time = "N/A",
|
||||
watt = "N/A"
|
||||
}
|
||||
function update()
|
||||
bat_now = {
|
||||
status = "Not present",
|
||||
ac_status = "N/A",
|
||||
perc = "N/A",
|
||||
time = "N/A",
|
||||
watt = "N/A"
|
||||
}
|
||||
|
||||
local bstr = "/sys/class/power_supply/" .. battery
|
||||
local present = first_line(bstr .. "/present")
|
||||
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"))
|
||||
if present == "1"
|
||||
then
|
||||
-- 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
|
||||
if bat_now.status == "Charging"
|
||||
then
|
||||
time_rat = (tot - rem) / (ratep or ratec)
|
||||
elseif bat_now.status == "Discharging"
|
||||
then
|
||||
time_rat = rem / (ratep or ratec)
|
||||
end
|
||||
local energy_percentage = tonumber(first_line(bstr .. "/capacity")) or
|
||||
math.floor((energy_now / energy_full) * 100)
|
||||
|
||||
local hrs = math.floor(time_rat)
|
||||
if hrs < 0 then hrs = 0 elseif hrs > 23 then hrs = 23 end
|
||||
bat_now.status = first_line(bstr .. "/status") or "N/A"
|
||||
bat_now.ac_status = first_line(astr .. "/online") or "N/A"
|
||||
|
||||
local min = math.floor((time_rat - hrs) * 60)
|
||||
if min < 0 then min = 0 elseif min > 59 then min = 59 end
|
||||
-- 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
|
||||
|
||||
bat_now.time = string.format("%02d:%02d", hrs, min)
|
||||
local rate_time = 0
|
||||
if bat_now.status == "Charging" then
|
||||
rate_time = (energy_full - energy_now) / rate_power or rate_current
|
||||
elseif bat_now.status == "Discharging" then
|
||||
rate_time = energy_now / rate_power or rate_current
|
||||
end
|
||||
|
||||
local perc = tonumber(first_line(bstr .. "/capacity")) or math.floor((rem / tot) * 100)
|
||||
local hours = math.floor(rate_time)
|
||||
local minutes = math.floor((rate_time - hours) * 60)
|
||||
|
||||
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
|
||||
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)
|
||||
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()
|
||||
|
||||
widget = bat.widget
|
||||
settings()
|
||||
-- notifications for low and critical states
|
||||
if bat_now.status == "Discharging" and notify == "on" and bat_now.perc then
|
||||
local nperc = tonumber(bat_now.perc) or 100
|
||||
if nperc <= 5 then
|
||||
bat.id = naughty.notify({
|
||||
preset = bat_notification_critical_preset,
|
||||
replaces_id = bat.id,
|
||||
}).id
|
||||
elseif nperc <= 15 then
|
||||
bat.id = naughty.notify({
|
||||
preset = bat_notification_low_preset,
|
||||
replaces_id = bat.id,
|
||||
}).id
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- notifications for low and critical states
|
||||
if bat_now.status == "Discharging" and notify == "on" and bat_now.perc
|
||||
then
|
||||
local nperc = tonumber(bat_now.perc) or 100
|
||||
if nperc <= 5
|
||||
then
|
||||
bat.id = naughty.notify({
|
||||
preset = bat_notification_critical_preset,
|
||||
replaces_id = bat.id,
|
||||
}).id
|
||||
elseif nperc <= 15
|
||||
then
|
||||
bat.id = naughty.notify({
|
||||
preset = bat_notification_low_preset,
|
||||
replaces_id = bat.id,
|
||||
}).id
|
||||
end
|
||||
end
|
||||
end
|
||||
newtimer(battery, timeout, update)
|
||||
|
||||
newtimer(battery, timeout, update)
|
||||
|
||||
return setmetatable(bat, { __index = bat.widget })
|
||||
return setmetatable(bat, { __index = bat.widget })
|
||||
end
|
||||
|
||||
return setmetatable({}, { __call = function(_, ...) return worker(...) end })
|
||||
|
|
|
|||
Loading…
Reference in New Issue