]> 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 #223 from monokles/bat-perc-fix
authorLuke Bonham <copycat-killer@users.noreply.github.com>
Tue, 16 Aug 2016 10:28:24 +0000 (12:28 +0200)
committerGitHub <noreply@github.com>
Tue, 16 Aug 2016 10:28:24 +0000 (12:28 +0200)
[partial] battery: calculate percentage for multiple instances with different capacities

widgets/bat.lua

index ec9a289bf86530cc9da2f78491dbc0b092e96e5a..00d718375b9356eb09072a2e29ac3dbe79cf135d 100644 (file)
@@ -131,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.floor(math.min(100, sum_energy_percentage / #batteries))))
+                bat_now.perc    = math.floor((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