]> 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:

Merge pull request #281 from alandmoore/master
[etc/awesome.git] / widgets / bat.lua
index 62016d70987b26899df61b9316d9ab93e005f546..ea749d3614c9179e9b1f5397fe4d86af7d030bf7 100644 (file)
@@ -7,18 +7,18 @@
                                                                                                                        
 --]]
 
-local newtimer     = require("lain.helpers").newtimer
 local first_line   = require("lain.helpers").first_line
-
+local make_widget  = require("lain.helpers").make_widget_textbox
+local newtimer     = require("lain.helpers").newtimer
 local naughty      = require("naughty")
 local wibox        = require("wibox")
-
 local math         = { abs    = math.abs,
                        floor  = math.floor,
                        log10  = math.log10,
                        min    = math.min }
 local string       = { format = string.format }
-
+local ipairs       = ipairs
+local type         = type
 local tonumber     = tonumber
 local setmetatable = setmetatable
 
@@ -26,7 +26,7 @@ local setmetatable = setmetatable
 -- lain.widgets.bat
 
 local function worker(args)
-    local bat       = {}
+    local bat       = make_widget()
     local args      = args or {}
     local timeout   = args.timeout or 30
     local batteries = args.batteries or (args.battery and {args.battery}) or {"BAT0"}
@@ -34,8 +34,6 @@ local function worker(args)
     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!",
@@ -61,19 +59,20 @@ local function worker(args)
     }
 
     bat_now.n_status = {}
+    bat_now.n_perc   = {}
     for i = 1, #batteries do
         bat_now.n_status[i] = "N/A"
+        bat_now.n_perc[i] = 0
     end
 
-    function update()
-        local sum_rate_current      = 0
-        local sum_rate_voltage      = 0
-        local sum_rate_power        = 0
-        local sum_rate_energy       = 0
-        local sum_energy_now        = 0
-        local sum_energy_full       = 0
-        local sum_energy_percentage = 0
-        local pspath                = "/sys/class/power_supply/"
+    function bat.update()
+        local sum_rate_current = 0
+        local sum_rate_voltage = 0
+        local sum_rate_power   = 0
+        local sum_rate_energy  = 0
+        local sum_energy_now   = 0
+        local sum_energy_full  = 0
+        local pspath           = "/sys/class/power_supply/"
 
         for i, battery in ipairs(batteries) do
             local bstr    = pspath .. battery
@@ -81,9 +80,9 @@ local function worker(args)
 
             if tonumber(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"))
+                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
@@ -97,18 +96,27 @@ local function worker(args)
                                           math.floor((energy_now / energy_full) * 100)
 
                 bat_now.n_status[i] = first_line(bstr .. "/status") or "N/A"
-
-                sum_rate_current      = sum_rate_current + (rate_current or 0)
-                sum_rate_voltage      = sum_rate_voltage + rate_voltage
-                sum_rate_power        = sum_rate_power + (rate_power or 0)
-                sum_rate_energy       = sum_rate_energy + (rate_power or ((rate_voltage * rate_current) / 1e6))
-                sum_energy_now        = sum_energy_now + (energy_now or 0)
-                sum_energy_full       = sum_energy_full + energy_full
-                sum_energy_percentage = sum_energy_percentage + energy_percentage
+                bat_now.n_perc[i]   = energy_percentage or bat_now.n_perc[i]
+
+                sum_rate_current = sum_rate_current + (rate_current or 0)
+                sum_rate_voltage = sum_rate_voltage + (rate_voltage or 0)
+                sum_rate_power   = sum_rate_power + (rate_power or 0)
+                sum_rate_energy  = sum_rate_energy + (rate_power or (((rate_voltage or 0) * (rate_current or 0)) / 1e6))
+                sum_energy_now   = sum_energy_now + (energy_now or 0)
+                sum_energy_full  = sum_energy_full + (energy_full or 0)
             end
         end
 
+        -- When one of the battery is charging, others' status are either
+        -- "Full", "Unknown" or "Charging". When the laptop is not plugged in,
+        -- one or more of the batteries may be full, but only one battery
+        -- discharging suffices to set global status to "Discharging".
         bat_now.status = bat_now.n_status[1]
+        for _,status in ipairs(bat_now.n_status) do
+            if status == "Discharging" or status == "Charging" then
+                bat_now.status = status
+            end
+        end
         bat_now.ac_status = tonumber(first_line(string.format("%s%s/online", pspath, ac))) or "N/A"
 
         if bat_now.status ~= "N/A" then
@@ -123,20 +131,24 @@ local function worker(args)
                     rate_time = sum_energy_now / div
                 end
 
-                if rate_time < 0.01 then -- check for magnitude discrepancies (#199)
+                if 0 < rate_time and rate_time < 0.01 then -- check for magnitude discrepancies (#199)
                     rate_time_magnitude = math.abs(math.floor(math.log10(rate_time)))
                     rate_time = rate_time * 10^(rate_time_magnitude - 2)
                 end
 
-                local hours     = math.floor(rate_time)
-                local minutes   = math.floor((rate_time - hours) * 60)
-                bat_now.perc    = tonumber(string.format("%d", math.min(100, sum_energy_percentage / #batteries)))
-                bat_now.time    = string.format("%02d:%02d", hours, minutes)
-                bat_now.watt    = tonumber(string.format("%.2f", sum_rate_energy / 1e6))
+                local hours   = math.floor(rate_time)
+                local minutes = math.floor((rate_time - hours) * 60)
+                bat_now.perc  = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100))
+                bat_now.time  = string.format("%02d:%02d", hours, minutes)
+                bat_now.watt  = tonumber(string.format("%.2f", sum_rate_energy / 1e6))
+            elseif bat_now.status ~= "Full" and sum_rate_power == 0 and bat_now.ac_status == 1 then
+                                                               bat_now.perc  = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100))
+                                                               bat_now.time  = "00:00"
+                                                               bat_now.watt  = 0
             elseif bat_now.status == "Full" then
-                bat_now.perc    = 100
-                bat_now.time    = "00:00"
-                bat_now.watt    = 0
+                bat_now.perc  = 100
+                bat_now.time  = "00:00"
+                bat_now.watt  = 0
             end
         end
 
@@ -144,7 +156,7 @@ local function worker(args)
         settings()
 
         -- notifications for low and critical states
-        if notify == "on" and bat_now.perc and bat_now.status == "Discharging" then
+        if notify == "on" and type(bat_now.perc) == "number" and bat_now.status == "Discharging" then
             if bat_now.perc <= 5 then
                 bat.id = naughty.notify({
                     preset = bat_notification_critical_preset,
@@ -159,9 +171,9 @@ local function worker(args)
         end
     end
 
-    newtimer(battery, timeout, update)
+    newtimer(battery, timeout, bat.update)
 
-    return setmetatable(bat, { __index = bat.widget })
+    return bat
 end
 
 return setmetatable({}, { __call = function(_, ...) return worker(...) end })