From: Luke Bonham Date: Tue, 22 Mar 2016 07:39:38 +0000 (+0100) Subject: bat: #177 fix Watt computation; make AC state available #178 X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/6ebe2d9e72175eee241f6e35e6d59bda770242e7?ds=inline;hp=--cc bat: #177 fix Watt computation; make AC state available #178 --- 6ebe2d9e72175eee241f6e35e6d59bda770242e7 diff --git a/widgets/alsabar.lua b/widgets/alsabar.lua index 7e8cd5a..83e27b5 100644 --- a/widgets/alsabar.lua +++ b/widgets/alsabar.lua @@ -127,7 +127,7 @@ local function worker(args) -- Capture mixer control state: [5%] ... ... [on] local volu, mute = string.match(mixer, "([%d]+)%%.*%[([%l]*)") - if tonumber(volu) ~= alsabar._current_level or string.match(mute, "on") ~= alsabar._muted + if (volu and tonumber(volu) ~= alsabar._current_level) or string.match(mute, "on") ~= alsabar._muted then alsabar._current_level = tonumber(volu) alsabar.bar:set_value(alsabar._current_level / 100) diff --git a/widgets/bat.lua b/widgets/bat.lua index d55be17..9740bbe 100644 --- a/widgets/bat.lua +++ b/widgets/bat.lua @@ -23,11 +23,12 @@ 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 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('') @@ -50,32 +51,34 @@ local function worker(args) function update() bat_now = { - status = "Not present", - perc = "N/A", - time = "N/A", - watt = "N/A" + status = "Not present", + ac_status = "N/A", + perc = "N/A", + time = "N/A", + watt = "N/A" } - local bstr = "/sys/class/power_supply/" .. battery - + local bstr = "/sys/class/power_supply/" .. battery local present = first_line(bstr .. "/present") if present == "1" then - local rate = first_line(bstr .. "/power_now") or - first_line(bstr .. "/current_now") + local rate = first_line(bstr .. "/power_now") + + local rate_alt = first_line(bstr .. "/current_now") - local ratev = first_line(bstr .. "/voltage_now") + local ratev = first_line(bstr .. "/voltage_now") - local rem = first_line(bstr .. "/energy_now") or - first_line(bstr .. "/charge_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") + local tot = first_line(bstr .. "/energy_full") or + first_line(bstr .. "/charge_full") bat_now.status = first_line(bstr .. "/status") or "N/A" + bat_now.ac = first_line(string.format("/sys/class/power_supply/%s/online", ac)) or "N/A" - rate = tonumber(rate) or 1 + rate = tonumber(rate) ratev = tonumber(ratev) rem = tonumber(rem) tot = tonumber(tot) @@ -107,8 +110,10 @@ local function worker(args) bat_now.perc = "0" end - if rate ~= nil and ratev ~= nil then + if rate and ratev then bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12) + elseif rate_alt then + bat_now.watt = string.format("%.2fW", rate_alt) else bat_now.watt = "N/A" end @@ -119,7 +124,7 @@ local function worker(args) settings() -- notifications for low and critical states - if bat_now.status == "Discharging" and notify == "on" and bat_now.perc ~= nil + if bat_now.status == "Discharging" and notify == "on" and bat_now.perc then local nperc = tonumber(bat_now.perc) or 100 if nperc <= 5 diff --git a/wiki b/wiki index a39f73e..f1868c3 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit a39f73e09d8862493c1c0db542c86db0918b4a39 +Subproject commit f1868c31feab78b1898998407a597e3c06ee71ba