X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/e5abb784433ce678273d72eb9716b18ac45b5c82..40d3c9e33af88711c78b50b5eb3d2d48388f796e:/widgets/bat.lua?ds=sidebyside diff --git a/widgets/bat.lua b/widgets/bat.lua index f3fcbdf..43b7a5f 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,7 +13,7 @@ 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 @@ -34,19 +34,19 @@ local function worker(args) bat.widget = wibox.widget.textbox('') bat_notification_low_preset = { - title = "Battery low", - text = "Plug the cable!", + title = "Battery low", + text = "Plug the cable!", timeout = 15, - fg = "#202020", - bg = "#CDCDCD" + fg = "#202020", + bg = "#CDCDCD" } bat_notification_critical_preset = { - title = "Battery exhausted", - text = "Shutdown imminent", + title = "Battery exhausted", + text = "Shutdown imminent", timeout = 15, - fg = "#000000", - bg = "#FFFFFF" + fg = "#000000", + bg = "#FFFFFF" } function update() @@ -59,60 +59,48 @@ local function worker(args) } 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 = tonumber(first_line(bstr .. "/power_now")) - local current_now = false + -- 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")) - if not rate then - rate = tonumber(first_line(bstr .. "/current_now")) - current_now = true - end - - local ratev = tonumber(first_line(bstr .. "/voltage_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) / rate - elseif bat_now.status == "Discharging" - then - time_rat = rem / rate - end - - local hrs = math.floor(time_rat) - if hrs < 0 then hrs = 0 elseif hrs > 23 then hrs = 23 end + local energy_percentage = tonumber(first_line(bstr .. "/capacity")) or + math.floor((energy_now / energy_full) * 100) - local min = math.floor((time_rat - hrs) * 60) - if min < 0 then min = 0 elseif min > 59 then min = 59 end + bat_now.status = first_line(bstr .. "/status") or "N/A" + bat_now.ac_status = first_line(astr .. "/online") or "N/A" - 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 - - if current_now then - bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12) - else - bat_now.watt = string.format("%.2fW", rate) + -- 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", math.min(100, energy_percentage)) + bat_now.time = string.format("%02d:%02d", hours, minutes) + bat_now.watt = string.format("%.2fW", watt) end end @@ -120,17 +108,14 @@ local function worker(args) settings() -- notifications for low and critical states - if bat_now.status == "Discharging" and notify == "on" and bat_now.perc - then + 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 + if nperc <= 5 then bat.id = naughty.notify({ preset = bat_notification_critical_preset, replaces_id = bat.id, }).id - elseif nperc <= 15 - then + elseif nperc <= 15 then bat.id = naughty.notify({ preset = bat_notification_low_preset, replaces_id = bat.id,