---[[
- tpbat.lua
- Battery status widget for ThinkPad laptops that use SMAPI
- lain.widgets.contrib.tpbat
-
- More on tp_smapi: http://www.thinkwiki.org/wiki/Tp_smapi
- Licensed under GNU General Public License v2
- * (c) 2013, Conor Heine
- * (c) 2013, Luke Bonham
- * (c) 2010-2012, Peter Hofmann
-
+--[[
+
+ tpbat.lua
+ Battery status widget for ThinkPad laptops that use SMAPI
+ lain.widgets.contrib.tpbat
+
+ More on tp_smapi: http://www.thinkwiki.org/wiki/Tp_smapi
+
+ Licensed under GNU General Public License v2
+ * (c) 2013, Conor Heine
+ * (c) 2013, Luke Bonham
+ * (c) 2010-2012, Peter Hofmann
+
--]]
+local debug = { getinfo = debug.getinfo }
local newtimer = require("lain.helpers").newtimer
local first_line = require("lain.helpers").first_line
local beautiful = require("beautiful")
local naughty = require("naughty")
local wibox = require("wibox")
-local smapi = require("lain.widgets.contrib.tpbat.smapi") -- Ugly :(
local string = { format = string.format }
local math = { floor = math.floor }
local tostring = tostring
local setmetatable = setmetatable
+package.path = debug.getinfo(1,"S").source:match[[^@?(.*[\/])[^\/]-$]] .. "?.lua;" .. package.path
+local smapi = require("smapi")
+
-- ThinkPad SMAPI-enabled battery info widget
+-- lain.widgets.contrib.tpbat
local tpbat = { }
-
local tpbat_notification = nil
function tpbat:hide()
- if tpbat_notification ~= nil
+ if tpbat_notification ~= nil
then
naughty.destroy(tpbat_notification)
tpbat_notification = nil
function tpbat:show(t_out)
tpbat:hide()
-
- local bat = self.bat
+
+ local bat = self.bat
+ local t_out = t_out or 0
+
if bat == nil or not bat:installed() then return end
local mfgr = bat:get('manufacturer') or "no_mfgr"
local time = bat:remaining_time()
local msg = "\t"
- if status ~= "idle" and status ~= "nil"
+ if status ~= "idle" and status ~= "nil"
then
- if time == "N/A"
+ if time == "N/A"
then
msg = "...Calculating time remaining..."
else
end
local str = string.format("%s : %s %s (%s)\n", bat.name, mfgr, model, chem)
- str = str .. string.format("\n%s \t\t\t %s", status:upper(), msg)
+ .. string.format("\n%s \t\t\t %s", status:upper(), msg)
tpbat_notification = naughty.notify({
preset = { fg = beautiful.fg_normal },
tpbat.bat = smapi:battery(battery) -- Create a new battery
local bat = tpbat.bat
-
+
tpbat.widget = wibox.widget.textbox('')
- if bat:get('state') == nil
+ if bat:get('state') == nil
then
local n = naughty.notify({
title = "SMAPI Battery Warning: Unable to read battery state!",
bat_now.perc = tostring(bat_now.perc)
end
- widget = tpbat.widget -- 'widget' needed in rc.lua (following convention)
+ widget = tpbat.widget
settings()
end
newtimer("tpbat", timeout, update)
- widget:connect_signal('mouse::enter', function () tpbat:show(0) end)
+ widget:connect_signal('mouse::enter', function () tpbat:show() end)
widget:connect_signal('mouse::leave', function () tpbat:hide() end)
return tpbat.widget
---[[
- smapi.lua
- Interface with thinkpad battery information
+--[[
+
+ smapi.lua
+ Interface with thinkpad battery information
+
Licensed under GNU General Public License v2
- * (c) 2013, Conor Heine
+ * (c) 2013, Conor Heine
--]]
-- Most are readable values, but some can be written to (not implemented, yet?)
local readable = {
- barcoding = true,
- charging_max_current = true,
- charging_max_voltage = true,
- chemistry = true,
- current_avg = true,
- current_now = true,
- cycle_count = true,
- design_capacity = true,
- design_voltage = true,
- dump = true,
- first_use_date = true,
- force_discharge = false,
- group0_voltage = true,
- group1_voltage = true,
- group2_voltage = true,
- group3_voltage = true,
- inhibit_charge_minutes = false,
- installed = true,
- last_full_capacity = true,
- manufacture_date = true,
- manufacturer = true,
- model = true,
- power_avg = true,
- power_now = true,
- remaining_capacity = true,
- remaining_charging_time = true,
- remaining_percent = true,
- remaining_percent_error = true,
- remaining_running_time = true,
+ barcoding = true,
+ charging_max_current = true,
+ charging_max_voltage = true,
+ chemistry = true,
+ current_avg = true,
+ current_now = true,
+ cycle_count = true,
+ design_capacity = true,
+ design_voltage = true,
+ dump = true,
+ first_use_date = true,
+ force_discharge = false,
+ group0_voltage = true,
+ group1_voltage = true,
+ group2_voltage = true,
+ group3_voltage = true,
+ inhibit_charge_minutes = false,
+ installed = true,
+ last_full_capacity = true,
+ manufacture_date = true,
+ manufacturer = true,
+ model = true,
+ power_avg = true,
+ power_now = true,
+ remaining_capacity = true,
+ remaining_charging_time = true,
+ remaining_percent = true,
+ remaining_percent_error = true,
+ remaining_running_time = true,
remaining_running_time_now = true,
- serial = true,
- start_charge_thresh = false,
- state = true,
- stop_charge_thresh = false,
- temperature = true,
- voltage = true,
+ serial = true,
+ start_charge_thresh = false,
+ state = true,
+ stop_charge_thresh = false,
+ temperature = true,
+ voltage = true,
}
function smapi:battery(name)
bat.name = name
bat.path = apipath .. "/" .. name
-
+
function bat:get(item)
return self.path ~= nil and readable[item] and first_line(self.path .. "/" .. item) or nil
end
local time_val = bat_now.status == 'discharging' and 'remaining_running_time' or 'remaining_charging_time'
local mins_left = self:get(time_val)
- if mins_left:find("^%d+") == nil
- then
- return "N/A"
+ if mins_left:find("^%d+") == nil
+ then
+ return "N/A"
end
-
+
local hrs = mins_left / 60
local min = mins_left % 60
return string.format("%02d:%02d", hrs, min)
return setmetatable(bat, {__metatable = false, __newindex = false})
end
-return smapi
\ No newline at end of file
+return smapi
projects / etc / awesome.git / commitdiff