X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/8d37b9a1e4521a220f20ce2e1414f656aa3a5015..202ab106d51a622d5a00b87c5f0b8b0997357933:/widgets/bat.lua diff --git a/widgets/bat.lua b/widgets/bat.lua index 5a811f0..d429c71 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 @@ -13,105 +13,161 @@ local first_line = require("lain.helpers").first_line local naughty = require("naughty") local wibox = require("wibox") -local math = { floor = math.floor } +local math = { floor = math.floor, min = math.min } local string = { format = string.format } +local tonumber = tonumber +local tostring = tostring 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 settings = args.settings or function() end + local bat = {} + local args = args or {} + local timeout = args.timeout or 30 + local batteries = args.batteries or (args.battery and {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_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_now = { - status = "not present", - perc = "N/A", - time = "N/A", - watt = "N/A" + status = "N/A", + ac_status = "N/A", + perc = "N/A", + time = "N/A", + watt = "N/A" } - widget = wibox.widget.textbox('') + bat_now.n_status = {} + for i = 1, #batteries do + bat_now.n_status[i] = "N/A" + end function update() - local present = first_line("/sys/class/power_supply/" - .. battery - .. "/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 + local sum_rate_current = 0 + local sum_rate_voltage = 0 + local sum_rate_power = 0 + local sum_energy_now = 0 + local sum_energy_full = 0 + local sum_energy_percentage = 0 + local pspath = "/sys/class/power_supply/" + + for i, battery in ipairs(batteries) do + local bstr = pspath .. battery + local present = first_line(bstr .. "/present") + + if tonumber(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")) + + -- energy_now(P)[uWh], charge_now(I)[uAh] + local energy_now = tonumber(first_line(bstr .. "/energy_now") or + first_line(bstr .. "/charge_now")) + + -- energy_full(P)[uWh], charge_full(I)[uAh] + local energy_full = tonumber(first_line(bstr .. "/energy_full") or + first_line(bstr .. "/charge_full")) + + local energy_percentage = tonumber(first_line(bstr .. "/capacity")) or + math.floor((energy_now / energy_full) * 100) + + bat_now.n_status[i] = first_line(bstr .. "/status") or "N/A" + + sum_rate_current = sum_rate_current + (rate_current or 0) + sum_rate_voltage = sum_rate_voltage + rate_voltage + sum_rate_power = sum_rate_power + (rate_power or ((rate_voltage * rate_current) / 1e6)) + sum_energy_now = sum_energy_now + (energy_now or 0) + sum_energy_full = sum_energy_full + energy_full + sum_energy_percentage = sum_energy_percentage + energy_percentage end + end - local hrs = math.floor(time_rat) - local min = (time_rat - hrs) * 60 + bat_now.status = bat_now.n_status[1] + bat_now.ac_status = tonumber(first_line(string.format("%s%s/online", pspath, ac))) or "N/A" + + if bat_now.status ~= "N/A" then + -- update {perc,time,watt} iff battery not full and rate > 0 + if bat_now.status ~= "Full" and (sum_rate_current > 0 or sum_rate_power > 0) then + local sum_rpc = sum_rate_power or sum_rate_current + local enr = 0 + local m1 = tostring(sum_rpc):len() + local m2 = 0 + + if bat_now.status == "Charging" then + enr = sum_energy_full - sum_energy_now + m2 = tostring(sum_energy_full):len() + else -- Discharging + enr = sum_energy_now + m2 = tostring(enr):len() + end + + -- solve magnitude differences, which may be caused + -- by file discrepancies + magnitude_diff = m1 - m2 + if magnitude_diff > 0 then + sum_rpc = sum_rpc / 10^magnitude_diff + elseif magnitude_diff < 0 then + enr = enr / 10^(magnitude_diff * -1) + end + + local rate_time = enr / sum_rpc + local hours = math.floor(rate_time) + local minutes = math.floor((rate_time - hours) * 60) + + bat_now.perc = tonumber(string.format("%d", math.min(100, sum_energy_percentage / #batteries))) + bat_now.time = string.format("%02d:%02d", hours, minutes) + bat_now.watt = tonumber(string.format("%.2f", sum_rate_power / 1e6)) + elseif bat_now.status == "Full" then + bat_now.perc = 100 + bat_now.time = "00:00" + bat_now.watt = 0 + end + end - bat_now.time = string.format("%02d:%02d", hrs, min) - bat_now.perc = (rem / tot) * 100 - bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12) + widget = bat.widget + settings() - -- notifications for low and critical states - if bat_now.perc <= 5 - then + -- notifications for low and critical states + if notify == "on" and bat_now.perc and bat_now.status == "Discharging" then + if bat_now.perc <= 5 then bat.id = naughty.notify({ - text = "shutdown imminent", - title = "battery nearly exhausted", - position = "top_right", - timeout = 15, - fg="#000000", - bg="#ffffff", - ontop = true, + preset = bat_notification_critical_preset, replaces_id = bat.id }).id - elseif bat.perc <= 15 - then + elseif bat_now.perc <= 15 then bat.id = naughty.notify({ - text = "plug the cable", - title = "battery low", - position = "top_right", - timeout = 15, - fg="#202020", - bg="#cdcdcd", - ontop = true, + 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 })