awesomewm-mirrors
/
lain
mirror of https://github.com/lcpz/lain.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'MaximeCheramy-master'

This commit is contained in:
Luke Bonham 2016-05-31 10:07:32 +02:00
parent 5efaca89d0 1afe5367af
commit e251c30fb0
1 changed files with 63 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
widgets/bat.lua
View File

@ -26,7 +26,7 @@ local function worker(args)
local bat = {} local bat = {}
local args = args or {} local args = args or {}
local timeout = args.timeout or 30 local timeout = args.timeout or 30
local battery = args.battery or "BAT0" local batteries = args.batteries or (args.battery and {args.battery}) or {"BAT0"}
local ac = args.ac or "AC0" local ac = args.ac or "AC0"
local notify = args.notify or "on" local notify = args.notify or "on"
local settings = args.settings or function() end local settings = args.settings or function() end
@ -58,8 +58,15 @@ local function worker(args)
watt = "N/A" watt = "N/A"
} }
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
for i, battery in ipairs(batteries) do
local bstr = "/sys/class/power_supply/" .. battery local bstr = "/sys/class/power_supply/" .. battery
local astr = "/sys/class/power_supply/" .. ac
local present = first_line(bstr .. "/present") local present = first_line(bstr .. "/present")
if present == "1" if present == "1"
@ -80,29 +87,41 @@ local function worker(args)
local energy_percentage = tonumber(first_line(bstr .. "/capacity")) or local energy_percentage = tonumber(first_line(bstr .. "/capacity")) or
math.floor((energy_now / energy_full) * 100) 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" bat_now.status = first_line(bstr .. "/status") or "N/A"
end
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_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" bat_now.ac_status = first_line(astr .. "/online") or "N/A"
-- update {perc,time,watt} iff rate > 0 and battery not full -- 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)) if ((sum_rate_current > 0) or (sum_rate_power > 0))
and bat_now.status ~= "N/A" and bat_now.status ~= "Full" and bat_now.status ~= "N/A" and bat_now.status ~= "Full"
then then
local rate_time = 0 local rate_time = 0
if bat_now.status == "Charging" then if bat_now.status == "Charging" then
rate_time = (energy_full - energy_now) / (rate_power or rate_current) rate_time = (sum_energy_full - sum_energy_now) / (sum_rate_power or sum_rate_current)
elseif bat_now.status == "Discharging" then elseif bat_now.status == "Discharging" then
rate_time = energy_now / (rate_power or rate_current) rate_time = sum_energy_now / (sum_rate_power or sum_rate_current)
end end
local hours = math.floor(rate_time) local hours = math.floor(rate_time)
local minutes = math.floor((rate_time - hours) * 60) local minutes = math.floor((rate_time - hours) * 60)
local watt = rate_power and (rate_power / 1e6) or (rate_voltage * rate_current) / 1e12 local watt = sum_rate_power / 1e6
bat_now.perc = string.format("%d", math.min(100, sum_energy_percentage / table.getn(batteries)))
bat_now.perc = string.format("%d", math.min(100, energy_percentage))
bat_now.time = string.format("%02d:%02d", hours, minutes) bat_now.time = string.format("%02d:%02d", hours, minutes)
bat_now.watt = string.format("%.2fW", watt) bat_now.watt = string.format("%.2fW", watt)
end end
end
widget = bat.widget widget = bat.widget
settings() settings()