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

projects / etc / awesome.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix boolean with number comparison
[etc/awesome.git] / widgets / bat.lua
diff --git a/widgets/bat.lua b/widgets/bat.lua
index 7b14a9a8dfa260191011a35e9274bc85ff344a81..3b9cca07bc290d0854dd5f4b92ff6319eb1637bc 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -1,10 +1,10 @@
 
 --[[
 
 --[[
-                                                  
-     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 newtimer     = require("lain.helpers").newtimer
 --]]
 
 local newtimer     = require("lain.helpers").newtimer
@@ -13,106 +13,145 @@ local first_line   = require("lain.helpers").first_line
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
-local math         = { floor  = math.floor }
+local math         = { floor  = math.floor, min = math.min }
 local string       = { format = string.format }
 local string       = { format = string.format }
+local tonumber     = tonumber
 
 local setmetatable = setmetatable
 
 -- Battery infos
 -- lain.widgets.bat
 
 local setmetatable = setmetatable
 
 -- Battery infos
 -- lain.widgets.bat
-local bat = {}
 
 local function worker(args)
 
 local function worker(args)
-    local args = args or {}
-    local timeout = args.timeout or 30
-    local battery = args.battery or "BAT0"
-    local settings = args.settings or function() end
+    local bat       = {}
+    local args      = args or {}
+    local timeout   = args.timeout or 30
+    local batteries = args.batteries or (args.battery and {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.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"
+    }
+
+    bat_now = {
+        status    = "Not present",
+        ac_status = "N/A",
+        perc      = "N/A",
+        time      = "N/A",
+        watt      = "N/A"
+    }
+
+    bat_now.n_status = {}
+    for i = 1, #batteries do
+        bat_now.n_status[i] = "Not present"
+    end
+
     function update()
     function update()
-        bat_now = {
-            status = "Not present",
-            perc   = "N/A",
-            time   = "N/A",
-            watt   = "N/A"
-        }
-
-        local present = first_line("/sys/class/power_supply/"
-                                   .. battery
-                                   .. "/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 time_rat = 0
-            if bat_now.status == "Charging"
+        local sum_rate_current = 0
+        local sum_rate_voltage = 0
+        local sum_rate_power = 0
+        local sum_energy_now = 0
+        local sum_energy_full = 0
+        local sum_energy_percentage = 0
+
+        for i, battery in ipairs(batteries) do
+            local bstr    = "/sys/class/power_supply/" .. battery
+            local present = first_line(bstr .. "/present")
+
+            if present == "1"
             then
             then
-                time_rat = (tot - rem) / rate
-            elseif bat_now.status == "Discharging"
-            then
-                time_rat = rem / rate
+                -- 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)
+
+                if bat_now.n_status[i] ~= "Charging" and bat_now.n_status[i] ~= "Discharging"
+                then
+                    bat_now.n_status[i] = first_line(bstr .. "/status") or "N/A"
+                end
+
+                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 ((rate_voltage * rate_current) / 1e6))
+                sum_energy_now        = sum_energy_now + energy_now
+                sum_energy_full       = sum_energy_full + energy_full
+                sum_energy_percentage = sum_energy_percentage + energy_percentage
             end
             end
+        end
 
 
-            local hrs = math.floor(time_rat)
-            local min = (time_rat - hrs) * 60
+        bat_now.status = bat_now.n_status[1]
+        bat_now.ac_status = first_line(string.format("/sys/class/power_supply/%s/online", ac)) or "N/A"
 
 
-            bat_now.time = string.format("%02d:%02d", hrs, min)
-            bat_now.perc = (rem / tot) * 100
-            bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)
+        -- update {perc,time,watt} iff rate > 0 and battery not full
+        if (sum_rate_current > 0 or sum_rate_power > 0) and not (bat_now.status == "Full")
+        then
+            local rate_time = 0
 
 
-            -- notifications for low and critical states
-            if bat_now.perc <= 5
-            then
-                bat.id = naughty.notify({
-                    text = "shutdown imminent",
-                    title = "battery nearly exhausted",
-                    position = "top_right",
-                    timeout = 15,
-                    fg="#000000",
-                    bg="#ffffff",
-                    ontop = true,
-                    replaces_id = bat.id
-                }).id
-            elseif bat_now.perc <= 15
-            then
-                bat.id = naughty.notify({
-                    text = "plug the cable",
-                    title = "battery low",
-                    position = "top_right",
-                    timeout = 15,
-                    fg="#202020",
-                    bg="#cdcdcd",
-                    ontop = true,
-                    replaces_id = bat.id
-                }).id
+            if bat_now.status == "Charging" then
+                rate_time = (sum_energy_full - sum_energy_now) / (sum_rate_power or sum_rate_current)
+            elseif bat_now.status == "Discharging" then
+                rate_time = sum_energy_now / (sum_rate_power or sum_rate_current)
             end
 
             end
 
-            bat_now.perc = string.format("%d", bat_now.perc)
+            local hours   = math.floor(rate_time)
+            local minutes = math.floor((rate_time - hours) * 60)
+            local watt    = sum_rate_power / 1e6
+
+            bat_now.perc  = string.format("%d", math.min(100, sum_energy_percentage / #batteries))
+            bat_now.time  = string.format("%02d:%02d", hours, minutes)
+            bat_now.watt  = string.format("%.2fW", watt)
         end
 
         widget = bat.widget
         settings()
         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
 
     end
 
-    newtimer("bat", timeout, update)
+    newtimer(battery, timeout, update)
 
 
-    return bat.widget
+    return setmetatable(bat, { __index = bat.widget })
 end
 
 end
 
-return setmetatable(bat, { __call = function(_, ...) return worker(...) end })
+return setmetatable({}, { __call = function(_, ...) return worker(...) end })
awesome window-manager configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.