Added gpmpd widget

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

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 0da970887357a08fe21edebd0eb5845014d00608..0c8fe5ffe4d9a637715ca9d7ac190d470bee57f1 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -50,7 +50,7 @@ local function worker(args)
     }
 
     bat_now = {
-        status    = "Not present",
+        status    = "N/A",
         ac_status = "N/A",
         perc      = "N/A",
         time      = "N/A",
@@ -59,7 +59,7 @@ local function worker(args)
 
     bat_now.n_status = {}
     for i = 1, #batteries do
-        bat_now.n_status[i] = "Not present"
+        bat_now.n_status[i] = "N/A"
     end
 
     function update()
@@ -74,13 +74,14 @@ local function worker(args)
             local bstr    = "/sys/class/power_supply/" .. battery
             local present = first_line(bstr .. "/present")
 
-            if present == "1"
+            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"))
 
+
                 -- energy_now(P)[uWh], charge_now(I)[uAh]
                 local energy_now        = tonumber(first_line(bstr .. "/energy_now") or
                                           first_line(bstr .. "/charge_now"))
@@ -97,33 +98,36 @@ local function worker(args)
                 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_now        = sum_energy_now + (energy_now or 0)
                 sum_energy_full       = sum_energy_full + energy_full
                 sum_energy_percentage = sum_energy_percentage + energy_percentage
             end
         end
 
         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"
-
-        -- update {perc,time,watt} iff battery not full and rate > 0
-        if bat_now.status ~= "Full" and (sum_rate_current > 0 or sum_rate_power > 0)
-        then
-            local rate_time = 0
-
-            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)
+        bat_now.ac_status = tonumber(first_line(string.format("/sys/class/power_supply/%s/online", ac))) or "N/A"
+
+        if bat_now.status ~= "N/A" then
+            -- update {perc,time,watt} iff battery not full and rate > 0
+            if bat_now.status ~= "Full" and (sum_rate_current > 0 or sum_rate_power > 0) then
+                local rate_time = 0
+
+                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
+
+                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_power / 1e6))
+            elseif bat_now.status == "Full" then
+                bat_now.perc  = 100
+                bat_now.time  = "00:00"
+                bat_now.watt  = 0
             end
-
-            local hours   = math.floor(rate_time)
-            local minutes = math.floor((rate_time - hours) * 60)
-            local watt    = sum_rate_power / 1e6
-
-            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("%.2fW", watt))
         end
 
         widget = bat.widget
@@ -131,12 +135,12 @@ local function worker(args)
 
         -- notifications for low and critical states
         if notify == "on" and bat_now.perc and bat_now.status == "Discharging" then
-            if perc <= 5 then
+            if bat_now.perc <= 5 then
                 bat.id = naughty.notify({
                     preset = bat_notification_critical_preset,
                     replaces_id = bat.id
                 }).id
-            elseif perc <= 15 then
+            elseif bat_now.perc <= 15 then
                 bat.id = naughty.notify({
                     preset = bat_notification_low_preset,
                     replaces_id = bat.id