#193: update iff rate > 0 and battery not full
This commit is contained in:
copycat-killer
parent
fe8e24e5f5
commit
de03791b81
1 changed files with 86 additions and 90 deletions
176
widgets/bat.lua
176
widgets/bat.lua
|
|
@ -23,114 +23,110 @@ local setmetatable = setmetatable
|
||||||
-- lain.widgets.bat
|
-- lain.widgets.bat
|
||||||
|
|
||||||
local function worker(args)
|
local function worker(args)
|
||||||
local bat = {}
|
local bat = {}
|
||||||
local args = args or {}
|
local args = args or {}
|
||||||
local timeout = args.timeout or 30
|
local timeout = args.timeout or 30
|
||||||
local battery = args.battery or "BAT0"
|
local battery = args.battery or "BAT0"
|
||||||
local ac = args.ac or "AC0"
|
local ac = args.ac or "AC0"
|
||||||
local notify = args.notify or "on"
|
local notify = args.notify or "on"
|
||||||
local settings = args.settings or function() end
|
local settings = args.settings or function() end
|
||||||
|
|
||||||
bat.widget = wibox.widget.textbox('')
|
bat.widget = wibox.widget.textbox('')
|
||||||
|
|
||||||
bat_notification_low_preset = {
|
bat_notification_low_preset = {
|
||||||
title = "Battery low",
|
title = "Battery low",
|
||||||
text = "Plug the cable!",
|
text = "Plug the cable!",
|
||||||
timeout = 15,
|
timeout = 15,
|
||||||
fg = "#202020",
|
fg = "#202020",
|
||||||
bg = "#CDCDCD"
|
bg = "#CDCDCD"
|
||||||
}
|
}
|
||||||
|
|
||||||
bat_notification_critical_preset = {
|
bat_notification_critical_preset = {
|
||||||
title = "Battery exhausted",
|
title = "Battery exhausted",
|
||||||
text = "Shutdown imminent",
|
text = "Shutdown imminent",
|
||||||
timeout = 15,
|
timeout = 15,
|
||||||
fg = "#000000",
|
fg = "#000000",
|
||||||
bg = "#FFFFFF"
|
bg = "#FFFFFF"
|
||||||
}
|
}
|
||||||
|
|
||||||
function update()
|
function update()
|
||||||
bat_now = {
|
bat_now = {
|
||||||
status = "Not present",
|
status = "Not present",
|
||||||
ac_status = "N/A",
|
ac_status = "N/A",
|
||||||
perc = "N/A",
|
perc = "N/A",
|
||||||
time = "N/A",
|
time = "N/A",
|
||||||
watt = "N/A"
|
watt = "N/A"
|
||||||
}
|
}
|
||||||
|
|
||||||
local bstr = "/sys/class/power_supply/" .. battery
|
local bstr = "/sys/class/power_supply/" .. battery
|
||||||
local astr = "/sys/class/power_supply/" .. ac
|
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
|
||||||
-- current_now(I)[uA], voltage_now(U)[uV], power_now(P)[uW]
|
-- current_now(I)[uA], voltage_now(U)[uV], power_now(P)[uW]
|
||||||
local rate_current = tonumber(first_line(bstr .. "/current_now"))
|
local rate_current = tonumber(first_line(bstr .. "/current_now"))
|
||||||
local rate_voltage = 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 rate_power = tonumber(first_line(bstr .. "/power_now"))
|
||||||
|
|
||||||
-- energy_now(P)[uWh], charge_now(I)[uAh]
|
-- energy_now(P)[uWh], charge_now(I)[uAh]
|
||||||
local energy_now = tonumber(first_line(bstr .. "/energy_now") or
|
local energy_now = tonumber(first_line(bstr .. "/energy_now") or
|
||||||
first_line(bstr .. "/charge_now"))
|
first_line(bstr .. "/charge_now"))
|
||||||
|
|
||||||
-- energy_full(P)[uWh], charge_full(I)[uAh],
|
-- energy_full(P)[uWh], charge_full(I)[uAh]
|
||||||
local energy_full = tonumber(first_line(bstr .. "/energy_full") or
|
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)
|
||||||
|
|
||||||
local energy_percentage = tonumber(first_line(bstr .. "/capacity")) or
|
bat_now.status = first_line(bstr .. "/status") or "N/A"
|
||||||
math.floor((energy_now / energy_full) * 100)
|
bat_now.ac_status = first_line(astr .. "/online") or "N/A"
|
||||||
|
|
||||||
bat_now.status = first_line(bstr .. "/status") or "N/A"
|
-- update {perc,time,watt} iff rate > 0 and battery not full
|
||||||
bat_now.ac_status = first_line(astr .. "/online") or "N/A"
|
if ((rate_current and rate_current > 0) or (rate_power and rate_power > 0))
|
||||||
|
and bat_now.status ~= "N/A" and bat_now.status ~= "Full"
|
||||||
|
then
|
||||||
|
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
|
||||||
|
|
||||||
-- if rate = 0 or rate not defined skip the round
|
local hours = math.floor(rate_time)
|
||||||
if not (rate_power and rate_power > 0) and
|
local minutes = math.floor((rate_time - hours) * 60)
|
||||||
not (rate_current and rate_current > 0) and
|
local watt = rate_power and (rate_power / 1e6) or (rate_voltage * rate_current) / 1e12
|
||||||
not (bat_now.status == "Full")
|
|
||||||
then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
local rate_time = 0
|
bat_now.perc = string.format("%d", energy_percentage)
|
||||||
if bat_now.status == "Charging" then
|
bat_now.time = string.format("%02d:%02d", hours, minutes)
|
||||||
rate_time = (energy_full - energy_now) / (rate_power or rate_current)
|
bat_now.watt = string.format("%.2fW", watt)
|
||||||
elseif bat_now.status == "Discharging" then
|
end
|
||||||
rate_time = energy_now / (rate_power or rate_current)
|
end
|
||||||
end
|
|
||||||
|
|
||||||
local hours = math.floor(rate_time)
|
widget = bat.widget
|
||||||
local minutes = math.floor((rate_time - hours) * 60)
|
settings()
|
||||||
local watt = rate_power and (rate_power / 1e6) or (rate_voltage * rate_current) / 1e12
|
|
||||||
|
|
||||||
bat_now.perc = string.format("%d", energy_percentage)
|
-- notifications for low and critical states
|
||||||
bat_now.time = string.format("%02d:%02d", hours, minutes)
|
if bat_now.status == "Discharging" and notify == "on" and bat_now.perc then
|
||||||
bat_now.watt = string.format("%.2fW", watt)
|
local nperc = tonumber(bat_now.perc) or 100
|
||||||
end
|
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
|
||||||
|
|
||||||
widget = bat.widget
|
newtimer(battery, timeout, update)
|
||||||
settings()
|
|
||||||
|
|
||||||
-- notifications for low and critical states
|
return setmetatable(bat, { __index = bat.widget })
|
||||||
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)
|
|
||||||
|
|
||||||
return setmetatable(bat, { __index = bat.widget })
|
|
||||||
end
|
end
|
||||||
|
|
||||||
return setmetatable({}, { __call = function(_, ...) return worker(...) end })
|
return setmetatable({}, { __call = function(_, ...) return worker(...) end })
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue