]>
git.madduck.net Git - etc/awesome.git/blobdiff - widgets/bat.lua
madduck's git repository
Every one of the projects in this repository is available at the canonical
URL git://git.madduck.net/madduck/pub/<projectpath> — see
each project's metadata for the exact URL.
All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@ git. madduck. net .
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
SSH access, as well as push access can be individually
arranged .
If you use my repositories frequently, consider adding the following
snippet to ~/.gitconfig and using the third clone URL listed for each
project:
[url "git://git.madduck.net/madduck/"]
insteadOf = madduck:
local naughty = require("naughty")
local wibox = require("wibox")
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 string = { format = string.format }
-local tonumber = tonumber
+local tonumber = tonumber
local setmetatable = setmetatable
-- Battery infos
local setmetatable = setmetatable
-- Battery infos
- 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_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 sum_energy_percentage = 0
local sum_energy_percentage = 0
+ local pspath = "/sys/class/power_supply/"
for i, battery in ipairs(batteries) do
for i, battery in ipairs(batteries) do
- local bstr = "/sys/class/power_supply/" .. battery
+ local bstr = pspath .. battery
local present = first_line(bstr .. "/present")
local present = first_line(bstr .. "/present")
- if tonumber(present) == 1
- then
+ 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"))
-- 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_now(P)[uWh], charge_now(I)[uAh]
local energy_now = tonumber(first_line(bstr .. "/energy_now") or
first_line(bstr .. "/charge_now"))
sum_rate_current = sum_rate_current + (rate_current or 0)
sum_rate_voltage = sum_rate_voltage + rate_voltage
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_rate_power = sum_rate_power + (rate_power or 0)
+ sum_rate_energy = sum_rate_energy + (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
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
bat_now.status = bat_now.n_status[1]
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"
+ 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 ~= "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
+ if bat_now.status ~= "Full" and (sum_rate_power > 0 or sum_rate_current > 0) then
+ local div = (sum_rate_power > 0 and sum_rate_power) or sum_rate_current
if bat_now.status == "Charging" then
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)
+ rate_time = (sum_energy_full - sum_energy_now) / div
+ else -- Discharging
+ rate_time = sum_energy_now / div
+ end
+
+ if 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)
- 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 = 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_energy / 1e6))
elseif bat_now.status == "Full" then
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
projects / etc / awesome.git / blobdiff