X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/1afe5367af3f643144ba7cdc1d6e289ec9b9b096..00c3a1bf386b627070d0883a59d5c8acecd14db7:/widgets/bat.lua diff --git a/widgets/bat.lua b/widgets/bat.lua index e1bc5d1..0c8fe5f 100644 --- a/widgets/bat.lua +++ b/widgets/bat.lua @@ -29,7 +29,7 @@ local function worker(args) 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 + local settings = args.settings or function() end bat.widget = wibox.widget.textbox('') @@ -49,15 +49,20 @@ local function worker(args) bg = "#FFFFFF" } - function update() - bat_now = { - status = "Not present", - ac_status = "N/A", - perc = "N/A", - time = "N/A", - watt = "N/A" - } + bat_now = { + status = "N/A", + ac_status = "N/A", + perc = "N/A", + time = "N/A", + watt = "N/A" + } + + bat_now.n_status = {} + for i = 1, #batteries do + bat_now.n_status[i] = "N/A" + end + function update() local sum_rate_current = 0 local sum_rate_voltage = 0 local sum_rate_power = 0 @@ -69,13 +74,14 @@ local function worker(args) local bstr = "/sys/class/power_supply/" .. battery local present = first_line(bstr .. "/present") - if present == "1" + 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")) @@ -87,57 +93,57 @@ local function worker(args) local energy_percentage = tonumber(first_line(bstr .. "/capacity")) or math.floor((energy_now / energy_full) * 100) - if bat_now.status ~= "Charging" and bat_now.status ~= "Discharging" - then - bat_now.status = first_line(bstr .. "/status") or "N/A" - end + 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 - sum_energy_full = sum_energy_full + energy_full + 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 astr = "/sys/class/power_supply/" .. ac - bat_now.ac_status = first_line(astr .. "/online") or "N/A" - - -- update {perc,time,watt} iff rate > 0 and battery not full - if ((sum_rate_current > 0) or (sum_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 = (sum_energy_full - sum_energy_now) / (sum_rate_power or sum_rate_current) - elseif bat_now.status == "Discharging" then - rate_time = sum_energy_now / (sum_rate_power or sum_rate_current) - end + bat_now.status = bat_now.n_status[1] + bat_now.ac_status = tonumber(first_line(string.format("/sys/class/power_supply/%s/online", 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 rate_time = 0 - local hours = math.floor(rate_time) - local minutes = math.floor((rate_time - hours) * 60) - local watt = sum_rate_power / 1e6 - bat_now.perc = string.format("%d", math.min(100, sum_energy_percentage / table.getn(batteries))) - bat_now.time = string.format("%02d:%02d", hours, minutes) - bat_now.watt = string.format("%.2fW", watt) + if bat_now.status == "Charging" then + rate_time = (sum_energy_full - sum_energy_now) / (sum_rate_power or sum_rate_current) + elseif bat_now.status == "Discharging" then + rate_time = sum_energy_now / (sum_rate_power or sum_rate_current) + end + + 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 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 + if notify == "on" and bat_now.perc and bat_now.status == "Discharging" then + if bat_now.perc <= 5 then bat.id = naughty.notify({ preset = bat_notification_critical_preset, - replaces_id = bat.id, + replaces_id = bat.id }).id - elseif nperc <= 15 then + elseif bat_now.perc <= 15 then bat.id = naughty.notify({ preset = bat_notification_low_preset, - replaces_id = bat.id, + replaces_id = bat.id }).id end end