X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/eb8cec907a50f3fd6df4b14ae10b910444017f92..84313cc876bce8b346ca83934de57b50488ab8cd:/widgets/bat.lua diff --git a/widgets/bat.lua b/widgets/bat.lua index 5a811f0..152fa12 100644 --- a/widgets/bat.lua +++ b/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 @@ -15,103 +15,118 @@ local wibox = require("wibox") local math = { floor = math.floor } local string = { format = string.format } +local tonumber = tonumber local setmetatable = setmetatable -- Battery infos -- lain.widgets.bat -local bat = { id = nil } local function worker(args) - local args = args or {} - local timeout = args.timeout or 30 - local battery = args.battery or "BAT0" + 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_now = { - status = "not present", - perc = "N/A", - time = "N/A", - watt = "N/A" + bat.widget = wibox.widget.textbox('') + + bat_notification_low_preset = { + title = "Battery low", + text = "Plug the cable!", + timeout = 15, + fg = "#202020", + bg = "#CDCDCD" } - widget = wibox.widget.textbox('') + bat_notification_critical_preset = { + title = "Battery exhausted", + text = "Shutdown imminent", + timeout = 15, + fg = "#000000", + bg = "#FFFFFF" + } function update() - local present = first_line("/sys/class/power_supply/" - .. battery - .. "/present") + 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 astr = "/sys/class/power_supply/" .. ac + local present = first_line(bstr .. "/present") if present == "1" then - local rate = first_line("/sys/class/power_supply/" - .. battery .. - "/power_now") - local ratev = first_line("/sys/class/power_supply/" - .. battery .. - "/voltage_now") - local rem = first_line("/sys/class/power_supply/" - .. battery .. - "/energy_now") - local tot = first_line("/sys/class/power_supply/" - .. battery .. - "/energy_full") - bat_now.status = first_line("/sys/class/power_supply/" - .. battery .. - "/status") - - local time_rat = 0 - if bat_now.status == "Charging" - then - time_rat = (tot - rem) / rate - elseif bat_now.status == "Discharging" - then - time_rat = rem / rate - end + -- 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")) + + -- energy_now(P)[uWh], charge_now(I)[uAh] + local energy_now = tonumber(first_line(bstr .. "/energy_now") or + first_line(bstr .. "/charge_now")) - local hrs = math.floor(time_rat) - local min = (time_rat - hrs) * 60 + -- 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.time = string.format("%02d:%02d", hrs, min) - bat_now.perc = (rem / tot) * 100 - bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12) + local energy_percentage = tonumber(first_line(bstr .. "/capacity")) or + math.floor((energy_now / energy_full) * 100) - -- notifications for low and critical states - if bat_now.perc <= 5 + bat_now.status = first_line(bstr .. "/status") or "N/A" + bat_now.ac_status = first_line(astr .. "/online") or "N/A" + + -- update {perc,time,watt} iff rate > 0 and battery not full + 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 + + local hours = math.floor(rate_time) + local minutes = math.floor((rate_time - hours) * 60) + local watt = rate_power and (rate_power / 1e6) or (rate_voltage * rate_current) / 1e12 + + bat_now.perc = string.format("%d", energy_percentage) + bat_now.time = string.format("%02d:%02d", hours, minutes) + bat_now.watt = string.format("%.2fW", watt) + end + end + + 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({ - text = "shutdown imminent", - title = "battery nearly exhausted", - position = "top_right", - timeout = 15, - fg="#000000", - bg="#ffffff", - ontop = true, - replaces_id = bat.id + preset = bat_notification_critical_preset, + replaces_id = bat.id, }).id - elseif bat.perc <= 15 - then + elseif nperc <= 15 then bat.id = naughty.notify({ - text = "plug the cable", - title = "battery low", - position = "top_right", - timeout = 15, - fg="#202020", - bg="#cdcdcd", - ontop = true, - replaces_id = bat.id + preset = bat_notification_low_preset, + replaces_id = bat.id, }).id end - - bat_now.perc = string.format("%d", bat_now.perc) end - - settings() end - newtimer("bat", timeout, update) + newtimer(battery, timeout, update) - return widget + return setmetatable(bat, { __index = bat.widget }) end -return setmetatable(bat, { __call = function(_, ...) return worker(...) end }) +return setmetatable({}, { __call = function(_, ...) return worker(...) end })