mirror of https://github.com/lcpz/lain.git
fixed formatting to follow contrib style
This commit is contained in:
parent
fac2ee9c11
commit
af7558fb16
|
@ -65,7 +65,7 @@ function tpbat:show(t_out)
|
||||||
tpbat_notification = naughty.notify({
|
tpbat_notification = naughty.notify({
|
||||||
preset = { fg = beautiful.fg_normal },
|
preset = { fg = beautiful.fg_normal },
|
||||||
text = str,
|
text = str,
|
||||||
timeout = t_out
|
timeout = t_out
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -80,17 +80,17 @@ function tpbat.register(args)
|
||||||
|
|
||||||
tpbat.widget = wibox.widget.textbox('')
|
tpbat.widget = wibox.widget.textbox('')
|
||||||
|
|
||||||
if bat:get('state') == nil then
|
if bat:get('state') == nil then
|
||||||
local n = naughty.notify({
|
local n = naughty.notify({
|
||||||
title = "SMAPI Battery Warning: Unable to read battery state!",
|
title = "SMAPI Battery Warning: Unable to read battery state!",
|
||||||
text = "This widget is intended for ThinkPads. Is tp_smapi installed? Check your configs & paths.",
|
text = "This widget is intended for ThinkPads. Is tp_smapi installed? Check your configs & paths.",
|
||||||
position = "top_right",
|
position = "top_right",
|
||||||
timeout = 15,
|
timeout = 15,
|
||||||
fg="#202020",
|
fg="#202020",
|
||||||
bg="#cdcdcd",
|
bg="#cdcdcd",
|
||||||
ontop = true
|
ontop = true
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
function update()
|
function update()
|
||||||
bat_now = {
|
bat_now = {
|
||||||
|
|
|
@ -19,81 +19,81 @@ local apipath = "/sys/devices/platform/smapi"
|
||||||
|
|
||||||
-- Most are readable values, but some can be written to (not implemented, yet?)
|
-- Most are readable values, but some can be written to (not implemented, yet?)
|
||||||
local readable = {
|
local readable = {
|
||||||
barcoding = true,
|
barcoding = true,
|
||||||
charging_max_current = true,
|
charging_max_current = true,
|
||||||
charging_max_voltage = true,
|
charging_max_voltage = true,
|
||||||
chemistry = true,
|
chemistry = true,
|
||||||
current_avg = true,
|
current_avg = true,
|
||||||
current_now = true,
|
current_now = true,
|
||||||
cycle_count = true,
|
cycle_count = true,
|
||||||
design_capacity = true,
|
design_capacity = true,
|
||||||
design_voltage = true,
|
design_voltage = true,
|
||||||
dump = true,
|
dump = true,
|
||||||
first_use_date = true,
|
first_use_date = true,
|
||||||
force_discharge = false,
|
force_discharge = false,
|
||||||
group0_voltage = true,
|
group0_voltage = true,
|
||||||
group1_voltage = true,
|
group1_voltage = true,
|
||||||
group2_voltage = true,
|
group2_voltage = true,
|
||||||
group3_voltage = true,
|
group3_voltage = true,
|
||||||
inhibit_charge_minutes = false,
|
inhibit_charge_minutes = false,
|
||||||
installed = true,
|
installed = true,
|
||||||
last_full_capacity = true,
|
last_full_capacity = true,
|
||||||
manufacture_date = true,
|
manufacture_date = true,
|
||||||
manufacturer = true,
|
manufacturer = true,
|
||||||
model = true,
|
model = true,
|
||||||
power_avg = true,
|
power_avg = true,
|
||||||
power_now = true,
|
power_now = true,
|
||||||
remaining_capacity = true,
|
remaining_capacity = true,
|
||||||
remaining_charging_time = true,
|
remaining_charging_time = true,
|
||||||
remaining_percent = true,
|
remaining_percent = true,
|
||||||
remaining_percent_error = true,
|
remaining_percent_error = true,
|
||||||
remaining_running_time = true,
|
remaining_running_time = true,
|
||||||
remaining_running_time_now = true,
|
remaining_running_time_now = true,
|
||||||
serial = true,
|
serial = true,
|
||||||
start_charge_thresh = false,
|
start_charge_thresh = false,
|
||||||
state = true,
|
state = true,
|
||||||
stop_charge_thresh = false,
|
stop_charge_thresh = false,
|
||||||
temperature = true,
|
temperature = true,
|
||||||
voltage = true,
|
voltage = true,
|
||||||
}
|
}
|
||||||
|
|
||||||
function smapi:battery(name)
|
function smapi:battery(name)
|
||||||
local bat = {}
|
local bat = {}
|
||||||
|
|
||||||
bat.name = name
|
bat.name = name
|
||||||
bat.path = apipath .. "/" .. name
|
bat.path = apipath .. "/" .. name
|
||||||
|
|
||||||
function bat:get(item)
|
function bat:get(item)
|
||||||
return self.path ~= nil and readable[item] and first_line(self.path .. "/" .. item) or nil
|
return self.path ~= nil and readable[item] and first_line(self.path .. "/" .. item) or nil
|
||||||
end
|
end
|
||||||
|
|
||||||
function bat:installed()
|
function bat:installed()
|
||||||
return self:get("installed") == "1"
|
return self:get("installed") == "1"
|
||||||
end
|
end
|
||||||
|
|
||||||
function bat:status()
|
function bat:status()
|
||||||
return self:get('state')
|
return self:get('state')
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Remaining time can either be time until battery dies or time until charging completes
|
-- Remaining time can either be time until battery dies or time until charging completes
|
||||||
function bat:remaining_time()
|
function bat:remaining_time()
|
||||||
local time_val = bat_now.status == 'discharging' and 'remaining_running_time' or 'remaining_charging_time'
|
local time_val = bat_now.status == 'discharging' and 'remaining_running_time' or 'remaining_charging_time'
|
||||||
local mins_left = self:get(time_val)
|
local mins_left = self:get(time_val)
|
||||||
|
|
||||||
if mins_left:find("^%d+") == nil then
|
if mins_left:find("^%d+") == nil then
|
||||||
return "N/A"
|
return "N/A"
|
||||||
end
|
end
|
||||||
|
|
||||||
local hrs = mins_left / 60
|
local hrs = mins_left / 60
|
||||||
local min = mins_left % 60
|
local min = mins_left % 60
|
||||||
return string.format("%02d:%02d", hrs, min)
|
return string.format("%02d:%02d", hrs, min)
|
||||||
end
|
end
|
||||||
|
|
||||||
function bat:percent()
|
function bat:percent()
|
||||||
return tonumber(self:get("remaining_percent"))
|
return tonumber(self:get("remaining_percent"))
|
||||||
end
|
end
|
||||||
|
|
||||||
return setmetatable(bat, {__metatable = false, __newindex = false})
|
return setmetatable(bat, {__metatable = false, __newindex = false})
|
||||||
end
|
end
|
||||||
|
|
||||||
return smapi
|
return smapi
|
Loading…
Reference in New Issue