end
function update()
- local sum_rate_current = 0
- local sum_rate_voltage = 0
- local sum_rate_power = 0
- local sum_energy_now = 0
- local sum_energy_full = 0
+ local sum_rate_current = 0
+ local sum_rate_voltage = 0
+ local sum_rate_power = 0
+ local sum_energy_now = 0
+ local sum_energy_full = 0
local sum_energy_percentage = 0
+ local pspath = "/sys/class/power_supply/"
for i, battery in ipairs(batteries) do
- local bstr = "/sys/class/power_supply/" .. battery
+ local bstr = pspath .. battery
local present = first_line(bstr .. "/present")
- if present == "1"
- then
+ if tonumber(present) == 1 then
-- current_now(I)[uA], voltage_now(U)[uV], power_now(P)[uW]
local rate_current = tonumber(first_line(bstr .. "/current_now"))
local rate_voltage = tonumber(first_line(bstr .. "/voltage_now"))
sum_rate_current = sum_rate_current + (rate_current or 0)
sum_rate_voltage = sum_rate_voltage + rate_voltage
sum_rate_power = sum_rate_power + (rate_power or ((rate_voltage * rate_current) / 1e6))
- sum_energy_now = sum_energy_now + energy_now
+ sum_energy_now = sum_energy_now + (energy_now or 0)
sum_energy_full = sum_energy_full + energy_full
sum_energy_percentage = sum_energy_percentage + energy_percentage
end
end
bat_now.status = bat_now.n_status[1]
- bat_now.ac_status = tonumber(first_line(string.format("/sys/class/power_supply/%s/online", ac))) or "N/A"
+ bat_now.ac_status = tonumber(first_line(string.format("%s%s/online", pspath, ac))) or "N/A"
if bat_now.status ~= "N/A" then
-- update {perc,time,watt} iff battery not full and rate > 0
if bat_now.status ~= "Full" and (sum_rate_current > 0 or sum_rate_power > 0) then
local rate_time = 0
+ local sum_rpc = sum_rate_power or sum_rate_current
+ if sum_rpc >= 1e8 then sum_rpc = sum_rpc / 10 end
if bat_now.status == "Charging" then
- rate_time = (sum_energy_full - sum_energy_now) / (sum_rate_power or sum_rate_current)
+ rate_time = (sum_energy_full - sum_energy_now) / sum_rpc
elseif bat_now.status == "Discharging" then
- rate_time = sum_energy_now / (sum_rate_power or sum_rate_current)
+ rate_time = sum_energy_now / sum_rpc
end
local hours = math.floor(rate_time)
local minutes = math.floor((rate_time - hours) * 60)
- local watt = (sum_rate_power / 1e6)
-
bat_now.perc = tonumber(string.format("%d", math.min(100, sum_energy_percentage / #batteries)))
bat_now.time = string.format("%02d:%02d", hours, minutes)
- bat_now.watt = tonumber(string.format("%.2f", watt))
- -- consistency check
+ bat_now.watt = tonumber(string.format("%.2f", sum_rate_power / 1e6))
elseif bat_now.status == "Full" then
- bat_now.perc = 100
+ bat_now.perc = 100
+ bat_now.time = "00:00"
+ bat_now.watt = 0
end
end