From: Luke Bonham Date: Mon, 4 Apr 2016 11:49:41 +0000 (+0200) Subject: Merge pull request #190 from aajjbb/master X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/e061c2ec063713e5a7f31f0627263e75dc037139?hp=c8a9c96dd334ae0eacd14c84856b62c6296b046f Merge pull request #190 from aajjbb/master fixing issue in case of nil rate_power in bat widget --- diff --git a/widgets/bat.lua b/widgets/bat.lua index d84883e..1391641 100644 --- a/widgets/bat.lua +++ b/widgets/bat.lua @@ -94,17 +94,19 @@ local function worker(args) 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 - 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) - + + 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.watt = string.format("%.2fW", rate_power / 1e6 or (rate_voltage * rate_current) / 1e12) + bat_now.watt = string.format("%.2fW", watt) end widget = bat.widget