bat: fix issue #17

diff --git a/layout/centerfair.lua b/layout/centerfair.lua
index d9ea677676e090cb76c3f98683166f9ce5e87206..49b4a14c6498f6dfa1ceba9ffa23e88ccd5faaf4 100644 (file)
--- a/layout/centerfair.lua
+++ b/layout/centerfair.lua
@@ -3,7 +3,7 @@
                                                   
      Licensed under GNU General Public License v2 
       * (c) 2013,      Luke Bonham                
                                                   
      Licensed under GNU General Public License v2 
       * (c) 2013,      Luke Bonham                

-      * (c) 2012,      Nicolas Estibals           
+      * (c) 2010,      Nicolas Estibals           

       * (c) 2010-2012, Peter Hofmann              
                                                   
 --]]
       * (c) 2010-2012, Peter Hofmann              
                                                   
 --]]

diff --git a/widgets/bat.lua b/widgets/bat.lua
index aa896407231bb28730317fcd7582ab8f8b66114b..a064e304054047a110ed16b5cfd77e9fe5ba419f 100644 (file)
--- a/widgets/bat.lua
+++ b/widgets/bat.lua
@@ -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)
             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"
 
             -- notifications for low and critical states
             if bat_now.status == "Discharging"