#193: update iff rate > 0 and battery not full

This commit is contained in:
copycat-killer 2016-04-11 09:38:56 +02:00
parent fe8e24e5f5
commit de03791b81

View file

@ -73,25 +73,20 @@ local function worker(args)
local energy_now = tonumber(first_line(bstr .. "/energy_now") or
first_line(bstr .. "/charge_now"))
-- energy_full(P)[uWh], charge_full(I)[uAh],
-- energy_full(P)[uWh], charge_full(I)[uAh]
local energy_full = tonumber(first_line(bstr .. "/energy_full") or
first_line(bstr .. "/charge_full"))
local energy_percentage = tonumber(first_line(bstr .. "/capacity")) or
math.floor((energy_now / energy_full) * 100)
bat_now.status = first_line(bstr .. "/status") or "N/A"
bat_now.ac_status = first_line(astr .. "/online") or "N/A"
-- if rate = 0 or rate not defined skip the round
if not (rate_power and rate_power > 0) and
not (rate_current and rate_current > 0) and
not (bat_now.status == "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))
and bat_now.status ~= "N/A" and bat_now.status ~= "Full"
then
return
end
local rate_time = 0
if bat_now.status == "Charging" then
rate_time = (energy_full - energy_now) / (rate_power or rate_current)
@ -107,6 +102,7 @@ local function worker(args)
bat_now.time = string.format("%02d:%02d", hours, minutes)
bat_now.watt = string.format("%.2fW", watt)
end
end
widget = bat.widget
settings()