X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/db253f9c550172a8331ee56d48f1c5ae4f59afb8..ebefc1e21d71c4b53e27e142cd199f3ec600da9c:/widgets/bat.lua?ds=inline diff --git a/widgets/bat.lua b/widgets/bat.lua index f3ddd33..991885a 100644 --- a/widgets/bat.lua +++ b/widgets/bat.lua @@ -13,11 +13,14 @@ local first_line = require("lain.helpers").first_line local naughty = require("naughty") local wibox = require("wibox") -local math = { floor = math.floor, min = math.min } +local math = { abs = math.abs, + floor = math.floor, + log10 = math.log10, + min = math.min } local string = { format = string.format } -local tonumber = tonumber -local tostring = tostring +local type = type +local tonumber = tonumber local setmetatable = setmetatable -- Battery infos @@ -59,19 +62,20 @@ local function worker(args) } bat_now.n_status = {} + bat_now.n_perc = {} for i = 1, #batteries do bat_now.n_status[i] = "N/A" + bat_now.n_perc[i] = 0 end function update() - 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/" - local pspath = "/home/luke/Download/" + local sum_rate_current = 0 + local sum_rate_voltage = 0 + local sum_rate_power = 0 + local sum_rate_energy = 0 + local sum_energy_now = 0 + local sum_energy_full = 0 + local pspath = "/sys/class/power_supply/" for i, battery in ipairs(batteries) do local bstr = pspath .. battery @@ -79,9 +83,9 @@ local function worker(args) 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")) + 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 @@ -95,13 +99,14 @@ local function worker(args) 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 + bat_now.n_perc[i] = energy_percentage or bat_now.n_perc[i] + + sum_rate_current = sum_rate_current + (rate_current or 0) + sum_rate_voltage = sum_rate_voltage + (rate_voltage or 0) + sum_rate_power = sum_rate_power + (rate_power or 0) + sum_rate_energy = sum_rate_energy + (rate_power or (((rate_voltage or 0) * (rate_current or 0)) / 1e6)) + sum_energy_now = sum_energy_now + (energy_now or 0) + sum_energy_full = sum_energy_full + (energy_full or 0) end end @@ -110,40 +115,34 @@ local function worker(args) 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 ~= "Full" and (sum_rate_power > 0 or sum_rate_current > 0) then + local rate_time = 0 + local div = (sum_rate_power > 0 and sum_rate_power) or sum_rate_current if bat_now.status == "Charging" then - enr = sum_energy_full - sum_energy_now - m2 = tostring(sum_energy_full):len() + rate_time = (sum_energy_full - sum_energy_now) / div else -- Discharging - enr = sum_energy_now - m2 = tostring(enr):len() + rate_time = sum_energy_now / div 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) + if 0 < rate_time and rate_time < 0.01 then -- check for magnitude discrepancies (#199) + rate_time_magnitude = math.abs(math.floor(math.log10(rate_time))) + rate_time = rate_time * 10^(rate_time_magnitude - 2) 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)) + local hours = math.floor(rate_time) + local minutes = math.floor((rate_time - hours) * 60) + bat_now.perc = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100)) + bat_now.time = string.format("%02d:%02d", hours, minutes) + bat_now.watt = tonumber(string.format("%.2f", sum_rate_energy / 1e6)) + elseif bat_now.status ~= "Full" and sum_rate_power == 0 and bat_now.ac_status == 1 then + bat_now.perc = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100)) + bat_now.time = "00:00" + bat_now.watt = 0 elseif bat_now.status == "Full" then - bat_now.perc = 100 - bat_now.time = "00:00" - bat_now.watt = 0 + bat_now.perc = 100 + bat_now.time = "00:00" + bat_now.watt = 0 end end @@ -151,7 +150,7 @@ local function worker(args) settings() -- notifications for low and critical states - if notify == "on" and bat_now.perc and bat_now.status == "Discharging" then + if notify == "on" and type(bat_now.perc) == "number" and bat_now.status == "Discharging" then if bat_now.perc <= 5 then bat.id = naughty.notify({ preset = bat_notification_critical_preset,