adam/lina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

battery: always update status #199 #203

Browse source
This commit is contained in:
Luke Bonham 2016-06-09 11:53:07 +02:00
parent e363fdfeaf
commit 5547a49496
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
widgets/bat.lua
View file

@ -92,10 +92,7 @@ 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.n_status[i] ~= "Charging" and bat_now.n_status[i] ~= "Discharging" bat_now.n_status[i] = first_line(bstr .. "/status") or "N/A"
then
bat_now.n_status[i] = first_line(bstr .. "/status") or "N/A"
end
sum_rate_current = sum_rate_current + (rate_current or 0) sum_rate_current = sum_rate_current + (rate_current or 0)
sum_rate_voltage = sum_rate_voltage + rate_voltage sum_rate_voltage = sum_rate_voltage + rate_voltage
@ -109,8 +106,8 @@ local function worker(args)
bat_now.status = bat_now.n_status[1] bat_now.status = bat_now.n_status[1]
bat_now.ac_status = first_line(string.format("/sys/class/power_supply/%s/online", ac)) 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 battery not full and rate > 0
if (sum_rate_current > 0 or sum_rate_power > 0) and not (bat_now.status == "Full") if bat_now.status ~= "Full" and (sum_rate_current > 0 or sum_rate_power > 0)
then then
local rate_time = 0 local rate_time = 0
@ -124,9 +121,9 @@ local function worker(args)
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 / #batteries)) 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.time = string.format("%02d:%02d", hours, minutes)
bat_now.watt = string.format("%.2fW", watt) bat_now.watt = tonumber(string.format("%.2fW", watt))
end end
widget = bat.widget widget = bat.widget
@ -134,16 +131,15 @@ local function worker(args)
-- notifications for low and critical states -- notifications for low and critical states
if notify == "on" and bat_now.perc and bat_now.status == "Discharging" then if notify == "on" and bat_now.perc and bat_now.status == "Discharging" then
local nperc = tonumber(bat_now.perc) or 100 if perc <= 5 then
if nperc <= 5 then
bat.id = naughty.notify({ bat.id = naughty.notify({
preset = bat_notification_critical_preset, preset = bat_notification_critical_preset,
replaces_id = bat.id, replaces_id = bat.id
}).id }).id
elseif nperc <= 15 then elseif perc <= 15 then
bat.id = naughty.notify({ bat.id = naughty.notify({
preset = bat_notification_low_preset, preset = bat_notification_low_preset,
replaces_id = bat.id, replaces_id = bat.id
}).id }).id
end end
end end