Merge pull request #6 from cahna/bat-fixes

silence warnings when battery is <15%, but charging
This commit is contained in:
Luke Bonham 2013-09-27 04:06:30 -07:00
commit 2fd9382035
2 changed files with 54 additions and 48 deletions

View File

@ -74,30 +74,33 @@ local function worker(args)
bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)
-- notifications for low and critical states
if bat_now.perc <= 5
if bat_new.status == "Discharging"
then
bat.id = naughty.notify({
text = "shutdown imminent",
title = "battery nearly exhausted",
position = "top_right",
timeout = 15,
fg="#000000",
bg="#ffffff",
ontop = true,
replaces_id = bat.id
}).id
elseif bat_now.perc <= 15
then
bat.id = naughty.notify({
text = "plug the cable",
title = "battery low",
position = "top_right",
timeout = 15,
fg="#202020",
bg="#cdcdcd",
ontop = true,
replaces_id = bat.id
}).id
if bat_now.perc <= 5
then
bat.id = naughty.notify({
text = "shutdown imminent",
title = "battery nearly exhausted",
position = "top_right",
timeout = 15,
fg="#000000",
bg="#ffffff",
ontop = true,
replaces_id = bat.id
}).id
elseif bat_now.perc <= 15
then
bat.id = naughty.notify({
text = "plug the cable",
title = "battery low",
position = "top_right",
timeout = 15,
fg="#202020",
bg="#cdcdcd",
ontop = true,
replaces_id = bat.id
}).id
end
end
bat_now.perc = string.format("%d", bat_now.perc)

View File

@ -113,36 +113,39 @@ function tpbat.register(args)
if bat:installed()
then
bat_now.status = bat:status()
bat_now.status = bat:status() or "N/A"
bat_now.perc = bat:percent()
bat_now.time = bat:remaining_time()
-- bat_now.watt = string.format("%.2fW", (VOLTS * AMPS) / 1e12)
-- notifications for low and critical states
if bat_now.perc <= 5
-- notifications for low and critical states (when discharging)
if bat_now.status == "discharging"
then
tpbat.id = naughty.notify({
text = "shutdown imminent",
title = "battery nearly exhausted",
position = "top_right",
timeout = 15,
fg="#000000",
bg="#ffffff",
ontop = true,
replaces_id = tpbat.id
}).id
elseif bat_now.perc <= 15
then
tpbat.id = naughty.notify({
text = "plug the cable",
title = "battery low",
position = "top_right",
timeout = 15,
fg="#202020",
bg="#cdcdcd",
ontop = true,
replaces_id = tpbat.id
}).id
if bat_now.perc <= 5
then
tpbat.id = naughty.notify({
text = "shutdown imminent",
title = "battery nearly exhausted",
position = "top_right",
timeout = 15,
fg="#000000",
bg="#ffffff",
ontop = true,
replaces_id = tpbat.id
}).id
elseif bat_now.perc <= 15
then
tpbat.id = naughty.notify({
text = "plug the cable",
title = "battery low",
position = "top_right",
timeout = 15,
fg="#202020",
bg="#cdcdcd",
ontop = true,
replaces_id = tpbat.id
}).id
end
end
bat_now.perc = tostring(bat_now.perc)