X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/5cde79f1c242afeb6cf748ddcba9e7582787c79d..68037080cd50887746db0529e20c4bd1f8c404d4:/widgets/bat.lua diff --git a/widgets/bat.lua b/widgets/bat.lua index ba1fa58..0bb5eff 100644 --- a/widgets/bat.lua +++ b/widgets/bat.lua @@ -30,35 +30,32 @@ local function worker(args) bat.widget = wibox.widget.textbox('') - function bat.update() + function update() bat_now = { - status = "not present", + status = "Not present", perc = "N/A", time = "N/A", watt = "N/A" } - local present = first_line("/sys/class/power_supply/" - .. battery - .. "/present") + local bstr = "/sys/class/power_supply/" .. battery + + local present = first_line(bstr .. "/present") if present == "1" then - local rate = first_line("/sys/class/power_supply/" - .. battery .. - "/power_now") - local ratev = first_line("/sys/class/power_supply/" - .. battery .. - "/voltage_now") - local rem = first_line("/sys/class/power_supply/" - .. battery .. - "/energy_now") - local tot = first_line("/sys/class/power_supply/" - .. battery .. - "/energy_full") - bat_now.status = first_line("/sys/class/power_supply/" - .. battery .. - "/status") + local rate = first_line(bstr .. "/power_now") or + first_line(bstr .. "/current_now") + + local ratev = first_line(bstr .. "/voltage_now") + + local rem = first_line(bstr .. "/energy_now") or + first_line(bstr .. "/charge_now") + + local tot = first_line(bstr .. "/energy_full") or + first_line(bstr .. "/charge_full") + + bat_now.status = first_line(bstr .. "/status") or "N/A" local time_rat = 0 if bat_now.status == "Charging" @@ -89,7 +86,7 @@ local function worker(args) ontop = true, replaces_id = bat.id }).id - elseif bat.perc <= 15 + elseif bat_now.perc <= 15 then bat.id = naughty.notify({ text = "plug the cable", @@ -110,7 +107,7 @@ local function worker(args) settings() end - newtimer("bat", timeout, bat.update) + newtimer("bat", timeout, update) return bat.widget end