]>
git.madduck.net Git - etc/awesome.git/blobdiff - widgets/bat.lua
madduck's git repository
Every one of the projects in this repository is available at the canonical
URL git://git.madduck.net/madduck/pub/<projectpath> — see
each project's metadata for the exact URL.
All patches and comments are welcome. Please squash your changes to logical
commits before using git-format-patch and git-send-email to
patches@ git. madduck. net .
If you'd read over the Git project's submission guidelines and adhered to them,
I'd be especially grateful.
SSH access, as well as push access can be individually
arranged .
If you use my repositories frequently, consider adding the following
snippet to ~/.gitconfig and using the third clone URL listed for each
project:
[url "git://git.madduck.net/madduck/"]
insteadOf = madduck:
-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")
local naughty = require("naughty")
local wibox = require("wibox")
- 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",
function update()
bat_now = {
status = "Not present",
local bstr = "/sys/class/power_supply/" .. battery
local bstr = "/sys/class/power_supply/" .. battery
- local present = helpers. first_line(bstr .. "/present")
+ local present = first_line(bstr .. "/present")
- local rate = helpers. first_line(bstr .. "/power_now") or
- helpers. first_line(bstr .. "/current_now")
+ local rate = first_line(bstr .. "/power_now") or
+ first_line(bstr .. "/current_now")
- local ratev = helpers. first_line(bstr .. "/voltage_now")
+ local ratev = first_line(bstr .. "/voltage_now")
- local rem = helpers. first_line(bstr .. "/energy_now") or
- helpers. first_line(bstr .. "/charge_now")
+ local rem = first_line(bstr .. "/energy_now") or
+ first_line(bstr .. "/charge_now")
- local tot = helpers. first_line(bstr .. "/energy_full") or
- helpers. first_line(bstr .. "/charge_full")
+ local tot = first_line(bstr .. "/energy_full") or
+ first_line(bstr .. "/charge_full")
- bat_now.status = helpers. first_line(bstr .. "/status") or "N/A"
+ bat_now.status = first_line(bstr .. "/status") or "N/A"
rate = tonumber(rate) or 1
ratev = tonumber(ratev)
rate = tonumber(rate) or 1
ratev = tonumber(ratev)
if min < 0 then min = 0 elseif min > 59 then min = 59 end
bat_now.time = string.format("%02d:%02d", hrs, min)
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
-
+
+ local perc = tonumber(first_line(bstr .. "/capacity"))
+
+ if not perc then
+ perc = (rem / tot) * 100
+ end
+
+ 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
+
if rate ~= nil and ratev ~= nil then
bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)
else
bat_now.watt = "N/A"
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)
+ widget = bat.widget
+ settings()
+
-- notifications for low and critical states
if bat_now.status == "Discharging" and notify == "on" and bat_now.perc ~= nil
then
-- notifications for low and critical states
if bat_now.status == "Discharging" and notify == "on" and bat_now.perc ~= nil
then
- helpers. newtimer(battery, timeout, update)
+ newtimer(battery, timeout, update)
+ return setmetatable(bat, { __index = bat.widget })
-return setmetatable(bat , { __call = function(_, ...) return worker(...) end })
+return setmetatable({} , { __call = function(_, ...) return worker(...) end })