X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/912bd26ede8901c98fd8d7a35f8493ee448109ad..e061c2ec063713e5a7f31f0627263e75dc037139:/widgets/bat.lua
diff --git a/widgets/bat.lua b/widgets/bat.lua
index d18af87..1391641 100644
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -1,13 +1,15 @@
--[[
-
- Licensed under GNU General Public License v2
- * (c) 2013, Luke Bonham
- * (c) 2010-2012, Peter Hofmann
-
+
+ Licensed under GNU General Public License v2
+ * (c) 2013, Luke Bonham
+ * (c) 2010-2012, Peter Hofmann
+
--]]
-local helpers = require("lain.helpers")
+local newtimer = require("lain.helpers").newtimer
+local first_line = require("lain.helpers").first_line
+
local naughty = require("naughty")
local wibox = require("wibox")
@@ -21,142 +23,115 @@ local setmetatable = setmetatable
-- lain.widgets.bat
local function worker(args)
- local bat = {}
- local args = args or {}
- local timeout = args.timeout or 30
- local battery = args.battery or "BAT0"
- local notify = args.notify or "on"
- local settings = args.settings or function() end
-
- bat.widget = wibox.widget.textbox('')
-
- bat_notification_low_preset = {
- title = "Battery low",
- text = "Plug the cable!",
- timeout = 15,
- fg = "#202020",
- bg = "#CDCDCD"
- }
-
- bat_notification_critical_preset = {
- title = "Battery exhausted",
- text = "Shutdown imminent",
- timeout = 15,
- fg = "#000000",
- bg = "#FFFFFF"
- }
-
- helpers.set_map(battery .. "status", "N/A")
- helpers.set_map(battery .. "perc", "N/A")
- helpers.set_map(battery .. "time", "N/A")
- helpers.set_map(battery .. "watt", "N/A")
-
- function update()
- bat_now = {
- status = "Not present",
- perc = "N/A",
- time = "N/A",
- watt = "N/A"
- }
-
- local bstr = "/sys/class/power_supply/" .. battery
-
- local present = helpers.first_line(bstr .. "/present")
-
- if present == "1"
- then
- local rate = helpers.first_line(bstr .. "/power_now") or
- helpers.first_line(bstr .. "/current_now")
-
- local ratev = helpers.first_line(bstr .. "/voltage_now")
-
- local rem = helpers.first_line(bstr .. "/energy_now") or
- helpers.first_line(bstr .. "/charge_now")
-
- local tot = helpers.first_line(bstr .. "/energy_full") or
- helpers.first_line(bstr .. "/charge_full")
-
- bat_now.status = helpers.first_line(bstr .. "/status") or "N/A"
-
- rate = tonumber(rate) or 1
- ratev = tonumber(ratev)
- rem = tonumber(rem)
- tot = tonumber(tot)
-
- local time_rat = 0
- if bat_now.status == "Charging"
- then
- time_rat = (tot - rem) / rate
- elseif bat_now.status == "Discharging"
- then
- time_rat = rem / rate
- end
-
- local hrs = math.floor(time_rat)
- if hrs < 0 then hrs = 0 elseif hrs > 23 then hrs = 23 end
-
- local min = math.floor((time_rat - hrs) * 60)
- if min < 0 then min = 0 elseif min > 59 then min = 59 end
-
- bat_now.time = string.format("%02d:%02d", hrs, min)
-
- bat_now.perc = helpers.first_line(bstr .. "/capacity")
-
- if not bat_now.perc then
- local perc = (rem / tot) * 100
- if perc <= 100 then
- bat_now.perc = string.format("%d", perc)
- elseif perc > 100 then
- bat_now.perc = "100"
- elseif perc < 0 then
- bat_now.perc = "0"
- end
- end
-
- if rate ~= nil and ratev ~= nil then
- bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)
- else
- bat_now.watt = "N/A"
- end
- end
-
- if bat_now.status ~= helpers.get_map(battery .. "status")
- or bat_now.perc ~= helpers.get_map(battery .. "perc")
- or bat_now.time ~= helpers.get_map(battery .. "time")
- or bat_now.watt ~= helpers.get_map(battery .. "watt")
- then
- widget = bat.widget
- settings()
-
- helpers.set_map(battery .. "status", bat_now.status)
- helpers.set_map(battery .. "perc", bat_now.perc)
- helpers.set_map(battery .. "time", bat_now.time)
- helpers.set_map(battery .. "watt", bat_now.watt)
- end
-
- -- notifications for low and critical states
- if bat_now.status == "Discharging" and notify == "on" and bat_now.perc ~= nil
- then
- local nperc = tonumber(bat_now.perc) or 100
- if nperc <= 5
- then
- bat.id = naughty.notify({
- preset = bat_notification_critical_preset,
- replaces_id = bat.id,
- }).id
- elseif nperc <= 15
- then
- bat.id = naughty.notify({
- preset = bat_notification_low_preset,
- replaces_id = bat.id,
- }).id
- end
- end
- end
-
- helpers.newtimer(battery, timeout, update)
-
- return bat.widget
+ local bat = {}
+ local args = args or {}
+ local timeout = args.timeout or 30
+ local battery = args.battery or "BAT0"
+ local ac = args.ac or "AC0"
+ local notify = args.notify or "on"
+ local settings = args.settings or function() end
+
+ bat.widget = wibox.widget.textbox('')
+
+ bat_notification_low_preset = {
+ title = "Battery low",
+ text = "Plug the cable!",
+ timeout = 15,
+ fg = "#202020",
+ bg = "#CDCDCD"
+ }
+
+ bat_notification_critical_preset = {
+ title = "Battery exhausted",
+ text = "Shutdown imminent",
+ timeout = 15,
+ fg = "#000000",
+ bg = "#FFFFFF"
+ }
+
+ function update()
+ bat_now = {
+ status = "Not present",
+ ac_status = "N/A",
+ perc = "N/A",
+ time = "N/A",
+ watt = "N/A"
+ }
+
+ local bstr = "/sys/class/power_supply/" .. battery
+ local astr = "/sys/class/power_supply/" .. ac
+ local present = first_line(bstr .. "/present")
+
+ if present == "1"
+ then
+ -- current_now(I)[uA], voltage_now(U)[uV], power_now(P)[uW]
+ local rate_current = tonumber(first_line(bstr .. "/current_now"))
+ local rate_voltage = tonumber(first_line(bstr .. "/voltage_now"))
+ local rate_power = tonumber(first_line(bstr .. "/power_now"))
+
+ -- energy_now(P)[uWh], charge_now(I)[uAh]
+ local energy_now = tonumber(first_line(bstr .. "/energy_now") or
+ first_line(bstr .. "/charge_now"))
+
+ -- 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")
+ then
+ return
+ end
+
+ local rate_time = 0
+ if bat_now.status == "Charging" then
+ rate_time = (energy_full - energy_now) / (rate_power or rate_current)
+ elseif bat_now.status == "Discharging" then
+ rate_time = energy_now / (rate_power or rate_current)
+ end
+
+ local hours = math.floor(rate_time)
+ local minutes = math.floor((rate_time - hours) * 60)
+
+ local watt = rate_power and (rate_power / 1e6) or (rate_voltage * rate_current) / 1e12
+
+ bat_now.perc = string.format("%d", energy_percentage)
+ bat_now.time = string.format("%02d:%02d", hours, minutes)
+ bat_now.watt = string.format("%.2fW", watt)
+ end
+
+ widget = bat.widget
+ settings()
+
+ -- notifications for low and critical states
+ if bat_now.status == "Discharging" and notify == "on" and bat_now.perc then
+ local nperc = tonumber(bat_now.perc) or 100
+ if nperc <= 5 then
+ bat.id = naughty.notify({
+ preset = bat_notification_critical_preset,
+ replaces_id = bat.id,
+ }).id
+ elseif nperc <= 15 then
+ bat.id = naughty.notify({
+ preset = bat_notification_low_preset,
+ replaces_id = bat.id,
+ }).id
+ end
+ end
+ end
+
+ newtimer(battery, timeout, update)
+
+ return setmetatable(bat, { __index = bat.widget })
end
-return setmetatable(bat, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })