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

pull #201 fixes

This commit is contained in:
Luke Bonham 2016-05-31 10:44:51 +02:00
parent e251c30fb0
commit 70bee86b8b
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
widgets/bat.lua
View File

@ -58,6 +58,11 @@ local function worker(args)
watt = "N/A" watt = "N/A"
} }
bat_now.n_status = {}
for i = 1, #batteries do
bat_now.n_status[i] = "Not present"
end
local sum_rate_current = 0 local sum_rate_current = 0
local sum_rate_voltage = 0 local sum_rate_voltage = 0
local sum_rate_power = 0 local sum_rate_power = 0
@ -87,9 +92,9 @@ 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" if bat_now.n_status[i] ~= "Charging" and bat_now.n_status[i] ~= "Discharging"
then then
bat_now.status = first_line(bstr .. "/status") or "N/A" bat_now.n_status[i] = first_line(bstr .. "/status") or "N/A"
end end
sum_rate_current = sum_rate_current + (rate_current or 0) sum_rate_current = sum_rate_current + (rate_current or 0)
@ -101,14 +106,15 @@ local function worker(args)
end end
end end
local astr = "/sys/class/power_supply/" .. ac bat_now.status = bat_now.n_status[1]
bat_now.ac_status = first_line(astr .. "/online") or "N/A" bat_now.ac_status = first_line(string.format("/sys/class/power_supply/%s/online", ac)) 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 ((sum_rate_current > 0) or (sum_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 = (sum_energy_full - sum_energy_now) / (sum_rate_power or sum_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
@ -118,7 +124,8 @@ local function worker(args)
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 = sum_rate_power / 1e6 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, sum_energy_percentage / #batteries))
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