From: Luke Bonham <copycat-killer@users.noreply.github.com>
Date: Tue, 22 Mar 2016 17:44:49 +0000 (+0100)
Subject: Merge pull request #181 from stwa/patch-5
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/d1b36bb53c43cb76c6882c2e13d13990ed1ad0ff?ds=sidebyside;hp=-c;pf=etc

Merge pull request #181 from stwa/patch-5

Fix for #177
---

d1b36bb53c43cb76c6882c2e13d13990ed1ad0ff
diff --combined widgets/bat.lua
index f3fcbdf,22584db..a6a8b4f
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@@ -63,14 -63,8 +63,8 @@@ local function worker(args
  
          if present == "1"
          then
-             local rate = tonumber(first_line(bstr .. "/power_now"))
-             local current_now = false
- 
-             if not rate then
-                 rate = tonumber(first_line(bstr .. "/current_now"))
-                 current_now = true
-             end
- 
+             local ratep    = tonumber(first_line(bstr .. "/power_now"))
+             local ratec    = tonumber(first_line(bstr .. "/current_now"))
              local ratev    = tonumber(first_line(bstr .. "/voltage_now"))
  
              local rem      = tonumber(first_line(bstr .. "/energy_now") or
@@@ -80,15 -74,15 +74,15 @@@
                                        first_line(bstr .. "/charge_full"))
  
              bat_now.status = first_line(bstr .. "/status") or "N/A"
 -            bat_now.ac     = first_line(string.format("/sys/class/power_supply/%s/online", ac)) or "N/A"
 +            bat_now.ac_status = first_line(string.format("/sys/class/power_supply/%s/online", ac)) or "N/A"
  
              local time_rat = 0
              if bat_now.status == "Charging"
              then
-                 time_rat = (tot - rem) / rate
+                 time_rat = (tot - rem) / (ratep or ratec)
              elseif bat_now.status == "Discharging"
              then
-                 time_rat = rem / rate
+                 time_rat = rem / (ratep or ratec)
              end
  
              local hrs = math.floor(time_rat)
@@@ -109,10 -103,10 +103,10 @@@
                  bat_now.perc = "0"
              end
  
-             if current_now then
-                 bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)
+             if ratep then
+                 bat_now.watt = string.format("%.2fW", ratep)
              else
-                 bat_now.watt = string.format("%.2fW", rate)
+                 bat_now.watt = string.format("%.2fW", (ratev * ratec) / 1e12)
              end
          end