Merge pull request #223 from monokles/bat-perc-fix

[partial] battery: calculate percentage for multiple instances with different capacities
This commit is contained in:
Luke Bonham 2016-08-16 12:28:24 +02:00 committed by GitHub
commit 5e6bcf354c
1 changed files with 1 additions and 1 deletions

View File

@ -131,7 +131,7 @@ local function worker(args)
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)
bat_now.perc = tonumber(string.format("%d", math.floor(math.min(100, sum_energy_percentage / #batteries)))) bat_now.perc = math.floor((sum_energy_now / sum_energy_full) * 100)
bat_now.time = string.format("%02d:%02d", hours, minutes) bat_now.time = string.format("%02d:%02d", hours, minutes)
bat_now.watt = tonumber(string.format("%.2f", sum_rate_energy / 1e6)) bat_now.watt = tonumber(string.format("%.2f", sum_rate_energy / 1e6))
elseif bat_now.status == "Full" then elseif bat_now.status == "Full" then