]> 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:

bat: fix issue #17
authorluke bonham <dadasignificanulla@gmail.com>
Sun, 6 Oct 2013 19:16:25 +0000 (21:16 +0200)
committercopycat-killer <dada@archlinux.info>
Wed, 5 Aug 2015 11:30:31 +0000 (13:30 +0200)
layout/centerfair.lua
widgets/bat.lua

index d9ea677676e090cb76c3f98683166f9ce5e87206..49b4a14c6498f6dfa1ceba9ffa23e88ccd5faaf4 100644 (file)
@@ -3,7 +3,7 @@
                                                   
      Licensed under GNU General Public License v2 
       * (c) 2013,      Luke Bonham                
-      * (c) 2012,      Nicolas Estibals           
+      * (c) 2010,      Nicolas Estibals           
       * (c) 2010-2012, Peter Hofmann              
                                                   
 --]]
index aa896407231bb28730317fcd7582ab8f8b66114b..a064e304054047a110ed16b5cfd77e9fe5ba419f 100644 (file)
@@ -79,8 +79,21 @@ local function worker(args)
             if min < 0 then min = 0 elseif min > 59 then min = 59 end
 
             bat_now.time = string.format("%02d:%02d", hrs, min)
-            bat_now.perc = string.format("%d", (rem / tot) * 100)
-            bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)
+
+            local perc = (rem / tot) * 100
+            if perc <= 100 then
+                bat_now.perc = string.format("%d", perc)
+            elseif perc > 100 then
+                bat_now.perc = "100"
+            elseif perc < 0 then
+                bat_now.perc = "0"
+            end
+
+            if rate ~= nil and ratev ~= nil then
+                bat_now.watt = string.format("%.2fW", (rate * ratev) / 1e12)
+            else
+                bat_not.watt = "N/A"
+            end
 
             -- notifications for low and critical states
             if bat_now.status == "Discharging"