}
bat_now.n_status = {}
+ bat_now.n_perc = {}
for i = 1, #batteries do
bat_now.n_status[i] = "N/A"
- bat_now.perc[i] = 0
+ bat_now.n_perc[i] = 0
end
- function update()
+ function bat.update()
local sum_rate_current = 0
local sum_rate_voltage = 0
local sum_rate_power = 0
math.floor((energy_now / energy_full) * 100)
bat_now.n_status[i] = first_line(bstr .. "/status") or "N/A"
- bat_now.perc[i] = energy_percentage or bat_now.perc[i]
+ bat_now.n_perc[i] = energy_percentage or bat_now.n_perc[i]
sum_rate_current = sum_rate_current + (rate_current or 0)
sum_rate_voltage = sum_rate_voltage + (rate_voltage or 0)
rate_time = sum_energy_now / div
end
- if rate_time < 0.01 then -- check for magnitude discrepancies (#199)
+ if 0 < rate_time and rate_time < 0.01 then -- check for magnitude discrepancies (#199)
rate_time_magnitude = math.abs(math.floor(math.log10(rate_time)))
rate_time = rate_time * 10^(rate_time_magnitude - 2)
end
bat_now.perc = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100))
bat_now.time = string.format("%02d:%02d", hours, minutes)
bat_now.watt = tonumber(string.format("%.2f", sum_rate_energy / 1e6))
+ elseif bat_now.status ~= "Full" and sum_rate_power == 0 and bat_now.ac_status == 1 then
+ bat_now.perc = math.floor(math.min(100, (sum_energy_now / sum_energy_full) * 100))
+ bat_now.time = "00:00"
+ bat_now.watt = 0
elseif bat_now.status == "Full" then
bat_now.perc = 100
bat_now.time = "00:00"
end
end
- newtimer(battery, timeout, update)
+ newtimer(battery, timeout, bat.update)
return setmetatable(bat, { __index = bat.widget })
end