]> git.madduck.net Git - etc/awesome.git/commitdiff

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 branch 'andering-patch-3'
authorLuke Bonham <dada@archlinux.info>
Thu, 31 Mar 2016 09:48:22 +0000 (11:48 +0200)
committerLuke Bonham <dada@archlinux.info>
Thu, 31 Mar 2016 09:48:22 +0000 (11:48 +0200)
widgets/bat.lua

index a6a8b4fc92fb1655b3e2a0784415744937c3607f..61ad6a33ebb5b8a722e18d5329887fe81b1741c6 100644 (file)
@@ -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
@@ -23,119 +23,118 @@ 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 ac       = args.ac or "AC0"
-    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!",
-        timeout = 15,
-        fg = "#202020",
-        bg = "#CDCDCD"
-    }
-
-    bat_notification_critical_preset = {
-        title = "Battery exhausted",
-        text = "Shutdown imminent",
-        timeout = 15,
-        fg = "#000000",
-        bg = "#FFFFFF"
-    }
-
-    function update()
-        bat_now = {
-            status    = "Not present",
-            ac_status = "N/A",
-            perc      = "N/A",
-            time      = "N/A",
-            watt      = "N/A"
-        }
-
-        local bstr    = "/sys/class/power_supply/" .. battery
-        local present = first_line(bstr .. "/present")
-
-        if present == "1"
-        then
-            local ratep    = tonumber(first_line(bstr .. "/power_now"))
-            local ratec    = tonumber(first_line(bstr .. "/current_now"))
-            local ratev    = tonumber(first_line(bstr .. "/voltage_now"))
-
-            local rem      = tonumber(first_line(bstr .. "/energy_now") or
-                                      first_line(bstr .. "/charge_now"))
-
-            local tot      = tonumber(first_line(bstr .. "/energy_full") or
-                                      first_line(bstr .. "/charge_full"))
-
-            bat_now.status = first_line(bstr .. "/status") or "N/A"
-            bat_now.ac_status = first_line(string.format("/sys/class/power_supply/%s/online", ac)) or "N/A"
-
-            local time_rat = 0
-            if bat_now.status == "Charging"
-            then
-                time_rat = (tot - rem) / (ratep or ratec)
-            elseif bat_now.status == "Discharging"
-            then
-                time_rat = rem / (ratep or ratec)
-            end
-
-            local hrs = math.floor(time_rat)
-            if hrs < 0 then hrs = 0 elseif hrs > 23 then hrs = 23 end
-
-            local min = math.floor((time_rat - hrs) * 60)
-            if min < 0 then min = 0 elseif min > 59 then min = 59 end
-
-            bat_now.time = string.format("%02d:%02d", hrs, min)
-
-            local perc = tonumber(first_line(bstr .. "/capacity")) or math.floor((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
-
-            if ratep then
-                bat_now.watt = string.format("%.2fW", ratep)
-            else
-                bat_now.watt = string.format("%.2fW", (ratev * ratec) / 1e12)
-            end
-        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
-
-    newtimer(battery, timeout, update)
-
-    return setmetatable(bat, { __index = bat.widget })
+       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('')
+
+       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"
+       }
+
+       function update()
+               bat_now = {
+                       status    = "Not present",
+                       ac_status = "N/A",
+                       perc      = "N/A",
+                       time      = "N/A",
+                       watt      = "N/A"
+               }
+
+               local bstr    = "/sys/class/power_supply/" .. battery
+               local astr    = "/sys/class/power_supply/" .. ac
+               local present = first_line(bstr .. "/present")
+
+               if 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"))
+
+                       -- 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)
+
+                       bat_now.status = first_line(bstr .. "/status") or "N/A"
+                       bat_now.ac_status     = first_line(astr .. "/online") or "N/A"
+
+                       -- if rate = 0 or rate not defined skip the round
+                       if      not (rate_power and rate_power > 0) and
+                               not (rate_current and  rate_current > 0) and
+                               not (bat_now.status == "Full")
+                       then
+                               return
+                       end
+                       
+                       local rate_time = 0
+                       if bat_now.status == "Charging"
+                       then
+                               rate_time = (energy_full - energy_now) / rate_power or rate_current
+                       elseif bat_now.status == "Discharging"
+                       then
+                               rate_time = energy_now / rate_power or rate_current
+                       end
+
+                       local hours   = math.floor(rate_time)
+                       local minutes = math.floor((rate_time - hours) * 60)
+
+                       bat_now.perc = string.format("%d", energy_percentage)
+                       bat_now.time = string.format("%02d:%02d", hours, minutes)
+                       bat_now.watt = string.format("%.2fW", rate_power / 1e6 or (rate_voltage * rate_current)  / 1e12)
+               
+               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
+
+       newtimer(battery, timeout, update)
+
+       return setmetatable(bat, { __index = bat.widget })
 end
 
 return setmetatable({}, { __call = function(_, ...) return worker(...) end })