#222 #223: readd math.min to catch #158

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

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 62016d70987b26899df61b9316d9ab93e005f546..43bb57fc52e72b57ab385b32736ed042e4d84ee1 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -19,6 +19,7 @@ local math         = { abs    = math.abs,
                        min    = math.min }
 local string       = { format = string.format }
 
                        min    = math.min }
 local string       = { format = string.format }
 

+local type         = type

 local tonumber     = tonumber
 local setmetatable = setmetatable
 
 local tonumber     = tonumber
 local setmetatable = setmetatable
 


@@ -99,12 +100,12 @@ local function worker(args)
                 bat_now.n_status[i] = first_line(bstr .. "/status") or "N/A"
 
                 sum_rate_current      = sum_rate_current + (rate_current or 0)
                 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_voltage      = sum_rate_voltage + (rate_voltage or 0)

                 sum_rate_power        = sum_rate_power + (rate_power or 0)
                 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_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_now        = sum_energy_now + (energy_now or 0)

-                sum_energy_full       = sum_energy_full + energy_full
-                sum_energy_percentage = sum_energy_percentage + energy_percentage
+                sum_energy_full       = sum_energy_full + (energy_full or 0)
+                sum_energy_percentage = sum_energy_percentage + (energy_percentage or 0)

             end
         end
 
             end
         end
 


@@ -130,7 +131,7 @@ local function worker(args)
 
                 local hours     = math.floor(rate_time)
                 local minutes   = math.floor((rate_time - hours) * 60)
 
                 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.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" then
                 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" then


@@ -144,7 +145,7 @@ local function worker(args)
         settings()
 
         -- notifications for low and critical states
         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,
             if bat_now.perc <= 5 then
                 bat.id = naughty.notify({
                     preset = bat_notification_critical_preset,