awesomewm-mirrors
/
awesome-wm-widgets
mirror of https://github.com/streetturtle/awesome-wm-widgets.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #59 from stnma7e/master 

Battery level is an accurate average of multiple batteries with differing capacities
This commit is contained in:
streetturtle 2018-11-26 16:33:03 -05:00 committed by GitHub
parent 1eefac87fa 2cf217dc6c
commit 7adf7e7641
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
battery-widget/battery.lua
View File

@ -69,14 +69,25 @@ end
local last_battery_check = os.time()
watch("acpi", 10,
watch("acpi -i", 10,
function(widget, stdout, stderr, exitreason, exitcode)
local batteryType
local battery_info = {}
local capacities = {}
for s in stdout:gmatch("[^\r\n]+") do
local _, status, charge_str, time = string.match(s, '(.+): (%a+), (%d?%d?%d)%%,? ?.*')
table.insert(battery_info, {status = status, charge = tonumber(charge_str)})
local status, charge_str, time = string.match(s, '.+: (%a+), (%d?%d?%d)%%,?.*')
if status ~= nil then
table.insert(battery_info, {status = status, charge = tonumber(charge_str)})
else
local cap_str = string.match(s, '.+:.+last full capacity (%d+)')
table.insert(capacities, tonumber(cap_str))
end
end
local capacity = 0
for i, cap in ipairs(capacities) do
capacity = capacity + cap
end
local charge = 0
@ -87,9 +98,9 @@ watch("acpi", 10,
-- this is arbitrary, and maybe another metric should be used
end
charge = charge + batt.charge
charge = charge + batt.charge * capacities[i]
end
charge = charge / #battery_info -- use average charge for battery icon
charge = charge / capacity
if (charge >= 0 and charge < 15) then
batteryType = "battery-empty%s-symbolic"

24
batteryarc-widget/batteryarc.lua
View File

@ -40,14 +40,25 @@ local batteryarc_widget = wibox.container.mirror(batteryarc, { horizontal = true
local last_battery_check = os.time()
watch("acpi", 10,
watch("acpi -i", 10,
function(widget, stdout, stderr, exitreason, exitcode)
local batteryType
local battery_info = {}
local capacities = {}
for s in stdout:gmatch("[^\r\n]+") do
local _, status, charge_str, time = string.match(s, '(.+): (%a+), (%d?%d?%d)%%,? ?.*')
table.insert(battery_info, {status = status, charge = tonumber(charge_str)})
local status, charge_str, time = string.match(s, '.+: (%a+), (%d?%d?%d)%%,?.*')
if status ~= nil then
table.insert(battery_info, {status = status, charge = tonumber(charge_str)})
else
local cap_str = string.match(s, '.+:.+last full capacity (%d+)')
table.insert(capacities, tonumber(cap_str))
end
end
local capacity = 0
for i, cap in ipairs(capacities) do
capacity = capacity + cap
end
local charge = 0
@ -58,9 +69,9 @@ watch("acpi", 10,
-- this is arbitrary, and maybe another metric should be used
end
charge = charge + batt.charge
charge = charge + batt.charge * capacities[i]
end
charge = charge / #battery_info -- use average charge for battery icon
charge = charge / capacity
widget.value = charge / 100
if status == 'Charging' then
@ -71,6 +82,8 @@ watch("acpi", 10,
mirrored_text_with_background.fg = beautiful.widget_main_color
end
text.text = charge
if charge < 15 then
batteryarc.colors = { beautiful.widget_red }
if status ~= 'Charging' and os.difftime(os.time(), last_battery_check) > 300 then
@ -84,7 +97,6 @@ watch("acpi", 10,
else
batteryarc.colors = { beautiful.widget_main_color }
end
text.text = charge
end,
batteryarc)