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

fixing issue in case of nil rate_power in bat widget
authoraajjbb <jefersonlsiq@gmail.com>
Sun, 3 Apr 2016 17:07:37 +0000 (14:07 -0300)
committeraajjbb <jefersonlsiq@gmail.com>
Sun, 3 Apr 2016 17:07:37 +0000 (14:07 -0300)
widgets/bat.lua

index d84883e81d31cee3454dbc178a2e96e34851b770..f20034b5e17943f4294c7e47fca3b52e79722117 100644 (file)
@@ -94,17 +94,19 @@ local function worker(args)
 
                        local rate_time = 0
                        if bat_now.status == "Charging" then
 
                        local rate_time = 0
                        if bat_now.status == "Charging" then
-                               rate_time = (energy_full - energy_now) / rate_power or rate_current
+                           rate_time = (energy_full - energy_now) / rate_power or rate_current
                        elseif bat_now.status == "Discharging" then
                        elseif bat_now.status == "Discharging" then
-                               rate_time = energy_now / rate_power or rate_current
+                           rate_time = energy_now / (rate_power or rate_current)
                        end
 
                        local hours   = math.floor(rate_time)
                        local minutes = math.floor((rate_time - hours) * 60)
                        end
 
                        local hours   = math.floor(rate_time)
                        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.time = string.format("%02d:%02d", hours, minutes)
                        bat_now.perc = string.format("%d", energy_percentage)
                        bat_now.time = string.format("%02d:%02d", hours, minutes)
-                       bat_now.watt = string.format("%.2fW", rate_power / 1e6 or (rate_voltage * rate_current)  / 1e12)
+                       bat_now.watt = string.format("%.2fW", watt)
                end
 
                widget = bat.widget
                end
 
                widget = bat.widget