X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/202ab106d51a622d5a00b87c5f0b8b0997357933..dd19cbc77a15510b4bf9101feddf3b10968d9cf1:/widgets/bat.lua

diff --git a/widgets/bat.lua b/widgets/bat.lua
index d429c71..ec9a289 100644
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -13,11 +13,14 @@ local first_line   = require("lain.helpers").first_line
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
-local math         = { floor  = math.floor, min = math.min }
+local math         = { abs    = math.abs,
+                       floor  = math.floor,
+                       log10  = math.log10,
+                       min    = math.min }
 local string       = { format = string.format }
-local tonumber     = tonumber
-local tostring     = tostring
 
+local type         = type
+local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- Battery infos
@@ -67,6 +70,7 @@ local function worker(args)
         local sum_rate_current      = 0
         local sum_rate_voltage      = 0
         local sum_rate_power        = 0
+        local sum_rate_energy       = 0
         local sum_energy_now        = 0
         local sum_energy_full       = 0
         local sum_energy_percentage = 0
@@ -96,11 +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)
-                sum_rate_voltage      = sum_rate_voltage + rate_voltage
-                sum_rate_power        = sum_rate_power + (rate_power or ((rate_voltage * rate_current) / 1e6))
+                sum_rate_voltage      = sum_rate_voltage + (rate_voltage or 0)
+                sum_rate_power        = sum_rate_power + (rate_power or 0)
+                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_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
 
@@ -109,36 +114,26 @@ local function worker(args)
 
         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 sum_rpc = sum_rate_power or sum_rate_current
-                local enr = 0
-                local m1 = tostring(sum_rpc):len()
-                local m2 = 0
+            if bat_now.status ~= "Full" and (sum_rate_power > 0 or sum_rate_current > 0) then
+                local rate_time = 0
+                local div = (sum_rate_power > 0 and sum_rate_power) or sum_rate_current
 
                 if bat_now.status == "Charging" then
-                    enr = sum_energy_full - sum_energy_now
-                    m2 = tostring(sum_energy_full):len()
+                    rate_time = (sum_energy_full - sum_energy_now) / div
                 else -- Discharging
-                    enr = sum_energy_now
-                    m2 = tostring(enr):len()
+                    rate_time = sum_energy_now / div
                 end
 
-                -- solve magnitude differences, which may be caused
-                -- by file discrepancies
-                magnitude_diff = m1 - m2
-                if magnitude_diff > 0 then
-                    sum_rpc = sum_rpc / 10^magnitude_diff
-                elseif magnitude_diff < 0 then
-                    enr = enr / 10^(magnitude_diff * -1)
+                if 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
 
-                local rate_time = enr / sum_rpc
                 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    = tonumber(string.format("%d", math.floor(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))
+                bat_now.watt    = tonumber(string.format("%.2f", sum_rate_energy / 1e6))
             elseif bat_now.status == "Full" then
                 bat_now.perc    = 100
                 bat_now.time    = "00:00"
@@ -150,7 +145,7 @@ local function worker(args)
         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,