X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/f37a31878edfb59d56c2b0fde04ae80c46a8809e..398edb9bf94ecd0d4a9a0cb22b8f93aeee69dde7:/widgets/temp.lua?ds=sidebyside

diff --git a/widgets/temp.lua b/widgets/temp.lua
index 5994f59..1c7e86c 100644
--- a/widgets/temp.lua
+++ b/widgets/temp.lua
@@ -6,13 +6,10 @@
                                                   
 --]]
 
-local newtimer     = require("lain.helpers").newtimer
-
+local helpers      = require("lain.helpers")
 local wibox        = require("wibox")
-
 local io           = { open = io.open }
 local tonumber     = tonumber
-
 local setmetatable = setmetatable
 
 -- coretemp
@@ -21,17 +18,16 @@ local temp = {}
 
 local function worker(args)
     local args     = args or {}
-    local timeout  = args.timeout or 5
+    local timeout  = args.timeout or 2
     local tempfile = args.tempfile or "/sys/class/thermal/thermal_zone0/temp"
     local settings = args.settings or function() end
 
-    temp.widget = wibox.widget.textbox('')
+    temp.widget = wibox.widget.textbox()
 
-    function update()
+    function temp.update()
         local f = io.open(tempfile)
-        if f ~= nil
-        then
-            coretemp_now = tonumber(f:read("*a")) / 1000
+        if f then
+            coretemp_now = tonumber(f:read("*all")) / 1000
             f:close()
         else
             coretemp_now = "N/A"
@@ -41,8 +37,9 @@ local function worker(args)
         settings()
     end
 
-    newtimer("coretemp", timeout, update)
-    return temp.widget
+    helpers.newtimer("coretemp", timeout, temp.update)
+
+    return temp
 end
 
 return setmetatable(temp, { __call = function(_, ...) return worker(...) end })