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

#199 #203 fix attempt 3

Browse source
This commit is contained in:
copycat-killer 2016-06-15 09:33:52 +02:00
parent 610bc1991a
commit 7384fa0fa6
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
widgets/bat.lua
View file

@ -74,13 +74,14 @@ local function worker(args)
local bstr = "/sys/class/power_supply/" .. battery local bstr = "/sys/class/power_supply/" .. battery
local present = first_line(bstr .. "/present") local present = first_line(bstr .. "/present")
if present == "1" if tonumber(present) == 1
then then
-- current_now(I)[uA], voltage_now(U)[uV], power_now(P)[uW] -- current_now(I)[uA], voltage_now(U)[uV], power_now(P)[uW]
local rate_current = tonumber(first_line(bstr .. "/current_now")) local rate_current = tonumber(first_line(bstr .. "/current_now"))
local rate_voltage = tonumber(first_line(bstr .. "/voltage_now")) local rate_voltage = tonumber(first_line(bstr .. "/voltage_now"))
local rate_power = tonumber(first_line(bstr .. "/power_now")) local rate_power = tonumber(first_line(bstr .. "/power_now"))
-- energy_now(P)[uWh], charge_now(I)[uAh] -- energy_now(P)[uWh], charge_now(I)[uAh]
local energy_now = tonumber(first_line(bstr .. "/energy_now") or local energy_now = tonumber(first_line(bstr .. "/energy_now") or
first_line(bstr .. "/charge_now")) first_line(bstr .. "/charge_now"))
@ -97,7 +98,7 @@ local function worker(args)
sum_rate_current = sum_rate_current + (rate_current or 0) sum_rate_current = sum_rate_current + (rate_current or 0)
sum_rate_voltage = sum_rate_voltage + rate_voltage sum_rate_voltage = sum_rate_voltage + rate_voltage
sum_rate_power = sum_rate_power + (rate_power or ((rate_voltage * rate_current) / 1e6)) 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_full = sum_energy_full + energy_full
sum_energy_percentage = sum_energy_percentage + energy_percentage sum_energy_percentage = sum_energy_percentage + energy_percentage
end end
@ -119,14 +120,13 @@ 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)
local watt = (sum_rate_power / 1e6)
bat_now.perc = tonumber(string.format("%d", math.min(100, sum_energy_percentage / #batteries))) 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.time = string.format("%02d:%02d", hours, minutes)
bat_now.watt = tonumber(string.format("%.2f", watt)) bat_now.watt = tonumber(string.format("%.2f", sum_rate_power / 1e6))
-- consistency check
elseif bat_now.status == "Full" then 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
end end