X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/7384fa0fa63aa5c487fd50b6263965d452d2059f..53b782f7c14871c6dd8c9d03fa14e45cedfd3298:/widgets/bat.lua

diff --git a/widgets/bat.lua b/widgets/bat.lua
index 0c8fe5f..d429c71 100644
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -16,6 +16,7 @@ local wibox        = require("wibox")
 local math         = { floor  = math.floor, min = math.min }
 local string       = { format = string.format }
 local tonumber     = tonumber
+local tostring     = tostring
 
 local setmetatable = setmetatable
 
@@ -63,25 +64,24 @@ local function worker(args)
     end
 
     function update()
-        local sum_rate_current = 0
-        local sum_rate_voltage = 0
-        local sum_rate_power = 0
-        local sum_energy_now = 0
-        local sum_energy_full = 0
+        local sum_rate_current      = 0
+        local sum_rate_voltage      = 0
+        local sum_rate_power        = 0
+        local sum_energy_now        = 0
+        local sum_energy_full       = 0
         local sum_energy_percentage = 0
+        local pspath                = "/sys/class/power_supply/"
 
         for i, battery in ipairs(batteries) do
-            local bstr    = "/sys/class/power_supply/" .. battery
+            local bstr    = pspath .. battery
             local present = first_line(bstr .. "/present")
 
-            if tonumber(present) == 1
-            then
+            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"))
@@ -105,28 +105,44 @@ local function worker(args)
         end
 
         bat_now.status = bat_now.n_status[1]
-        bat_now.ac_status = tonumber(first_line(string.format("/sys/class/power_supply/%s/online", ac))) or "N/A"
+        bat_now.ac_status = tonumber(first_line(string.format("%s%s/online", pspath, 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
+                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 == "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)
+                    enr = sum_energy_full - sum_energy_now
+                    m2 = tostring(sum_energy_full):len()
+                else -- Discharging
+                    enr = sum_energy_now
+                    m2 = tostring(enr):len()
+                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)
                 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))
+                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.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
+                bat_now.perc    = 100
+                bat_now.time    = "00:00"
+                bat_now.watt    = 0
             end
         end