adam/lina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #190 from aajjbb/master

Browse source 
fixing issue in case of nil rate_power in bat widget
This commit is contained in:
Luke Bonham 2016-04-04 13:49:41 +02:00
commit e061c2ec06
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
widgets/bat.lua
View file

@ -94,17 +94,19 @@ local function worker(args)
local rate_time = 0 local rate_time = 0
if bat_now.status == "Charging" then 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 end
local hours = math.floor(rate_time) local hours = math.floor(rate_time)
local minutes = math.floor((rate_time - hours) * 60) 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.perc = string.format("%d", energy_percentage)
bat_now.time = string.format("%02d:%02d", hours, minutes) 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 end
widget = bat.widget widget = bat.widget