Merge branch 'master' of github.com:copycat-killer/lain into HEAD

[etc/awesome.git] / widgets / temp.lua

diff --git a/widgets/temp.lua b/widgets/temp.lua
index 6831588f3e7714d330c55dba73412331d327c233..a4ada5276de7d667d8ad8fb5c155935651f099c3 100644 (file)
--- a/widgets/temp.lua
+++ b/widgets/temp.lua
@@ -6,7 +6,8 @@
                                                   
 --]]
 
                                                   
 --]]
 

-local helpers      = require("lain.helpers")
+local newtimer     = require("lain.helpers").newtimer
+

 local wibox        = require("wibox")
 
 local io           = { open = io.open }
 local wibox        = require("wibox")
 
 local io           = { open = io.open }


@@ -20,31 +21,26 @@ local temp = {}
 
 local function worker(args)
     local args     = args or {}
 
 local function worker(args)
     local args     = args or {}

-    local timeout  = args.timeout or 1
+    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('')
     local tempfile = args.tempfile or "/sys/class/thermal/thermal_zone0/temp"
     local settings = args.settings or function() end
 
     temp.widget = wibox.widget.textbox('')

-    helpers.set_map("temp_last", 0)

 
     function update()
         local f = io.open(tempfile)
 
     function update()
         local f = io.open(tempfile)

-        if f ~= nil
-        then
+        if f then

             coretemp_now = tonumber(f:read("*all")) / 1000
             f:close()
         else
             coretemp_now = "N/A"
         end
 
             coretemp_now = tonumber(f:read("*all")) / 1000
             f:close()
         else
             coretemp_now = "N/A"
         end
 

-        if helpers.get_map("temp_last") ~= coretemp_now then
-            widget = temp.widget
-            settings()
-            helpers.set_map("temp_last", coretemp_now)
-        end
+        widget = temp.widget
+        settings()

     end
 
     end
 

-    helpers.newtimer("coretemp", timeout, update)
+    newtimer("coretemp", timeout, update)

 
     return temp.widget
 end
 
     return temp.widget
 end