]> git.madduck.net Git - etc/awesome.git/blobdiff - widgets/bat.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

#222 #223: readd math.min to catch #158
[etc/awesome.git] / widgets / bat.lua
index 2da5e2d426cf19fa2ed9c6452504baf83ba4619a..43bb57fc52e72b57ab385b32736ed042e4d84ee1 100644 (file)
@@ -75,7 +75,6 @@ local function worker(args)
         local sum_energy_full       = 0
         local sum_energy_percentage = 0
         local pspath                = "/sys/class/power_supply/"
-        pspath = "/home/luke/Download/"
 
         for i, battery in ipairs(batteries) do
             local bstr    = pspath .. battery
@@ -132,7 +131,7 @@ local function worker(args)
 
                 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