]> git.madduck.net Git - etc/awesome.git/commitdiff

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:

Merge pull request #197 from aajjbb/master
authorLuke Bonham <copycat-killer@users.noreply.github.com>
Tue, 17 May 2016 15:30:37 +0000 (17:30 +0200)
committerLuke Bonham <copycat-killer@users.noreply.github.com>
Tue, 17 May 2016 15:30:37 +0000 (17:30 +0200)
fixing battery percentage going above 100

widgets/bat.lua

index 152fa12a626a6ed70eb7f17d6e8521209be436e6..43b7a5f22102fd0cc54bd0ce2bde021586fc415b 100644 (file)
@@ -13,7 +13,7 @@ local first_line   = require("lain.helpers").first_line
 local naughty      = require("naughty")
 local wibox        = require("wibox")
 
-local math         = { floor  = math.floor }
+local math         = { floor  = math.floor, min = math.min }
 local string       = { format = string.format }
 local tonumber     = tonumber
 
@@ -98,7 +98,7 @@ local function worker(args)
                 local minutes = math.floor((rate_time - hours) * 60)
                 local watt    = rate_power and (rate_power / 1e6) or (rate_voltage * rate_current) / 1e12
 
-                bat_now.perc = string.format("%d", energy_percentage)
+                bat_now.perc = string.format("%d", math.min(100, energy_percentage))
                 bat_now.time = string.format("%02d:%02d", hours, minutes)
                 bat_now.watt = string.format("%.2fW", watt)
             end