readme updated

[etc/awesome.git] / widgets / bat.lua

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 54959eb0f01e0d646074e2300f764190cdd826e3..8e483f75dd8a2127fd1c54541be0d731ab8dc8e4 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -7,7 +7,7 @@
                                                                                                                        
 --]]
 
                                                                                                                        
 --]]
 

-local newtimer     = require("lain.helpers").newtimer
+local helpers      = require("lain.helpers")

 local first_line   = require("lain.helpers").first_line
 
 local naughty      = require("naughty")
 local first_line   = require("lain.helpers").first_line
 
 local naughty      = require("naughty")


@@ -27,7 +27,7 @@ local setmetatable = setmetatable
 -- lain.widgets.bat
 
 local function worker(args)
 -- lain.widgets.bat
 
 local function worker(args)

-    local bat       = {}
+    local bat       = helpers.make_widget_textbox()

     local args      = args or {}
     local timeout   = args.timeout or 30
     local batteries = args.batteries or (args.battery and {args.battery}) or {"BAT0"}
     local args      = args or {}
     local timeout   = args.timeout or 30
     local batteries = args.batteries or (args.battery and {args.battery}) or {"BAT0"}


@@ -35,8 +35,6 @@ local function worker(args)
     local notify    = args.notify or "on"
     local settings  = args.settings or function() end
 
     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!",
     bat_notification_low_preset = {
         title   = "Battery low",
         text    = "Plug the cable!",


@@ -62,12 +60,13 @@ local function worker(args)
     }
 
     bat_now.n_status = {}
     }
 
     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
 
     for i = 1, #batteries do
         bat_now.n_status[i] = "N/A"
         bat_now.n_perc[i] = 0
     end
 

-    function update()
+    function bat.update()

         local sum_rate_current = 0
         local sum_rate_voltage = 0
         local sum_rate_power   = 0
         local sum_rate_current = 0
         local sum_rate_voltage = 0
         local sum_rate_power   = 0


@@ -98,7 +97,7 @@ local function worker(args)
                                           math.floor((energy_now / energy_full) * 100)
 
                 bat_now.n_status[i] = first_line(bstr .. "/status") or "N/A"
                                           math.floor((energy_now / energy_full) * 100)
 
                 bat_now.n_status[i] = first_line(bstr .. "/status") or "N/A"

-                bat_now.perc[i]     = energy_percentage or bat_now.perc[i]
+                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_current = sum_rate_current + (rate_current or 0)
                 sum_rate_voltage = sum_rate_voltage + (rate_voltage or 0)


@@ -124,7 +123,7 @@ local function worker(args)
                     rate_time = sum_energy_now / div
                 end
 
                     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
                     rate_time_magnitude = math.abs(math.floor(math.log10(rate_time)))
                     rate_time = rate_time * 10^(rate_time_magnitude - 2)
                 end


@@ -134,6 +133,10 @@ local function worker(args)
                 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))
                 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"
             elseif bat_now.status == "Full" then
                 bat_now.perc  = 100
                 bat_now.time  = "00:00"


@@ -160,9 +163,9 @@ local function worker(args)
         end
     end
 
         end
     end
 

-    newtimer(battery, timeout, update)
+    helpers.newtimer(battery, timeout, bat.update)

 
 

-    return setmetatable(bat, { __index = bat.widget })
+    return bat

 end
 
 return setmetatable({}, { __call = function(_, ...) return worker(...) end })
 end
 
 return setmetatable({}, { __call = function(_, ...) return worker(...) end })