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

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

diff --git a/widgets/temp.lua b/widgets/temp.lua
index b57c477929b1e0315b03b0ba4181671aa4278289..6831588f3e7714d330c55dba73412331d327c233 100644 (file)
--- a/widgets/temp.lua
+++ b/widgets/temp.lua
@@ -6,11 +6,10 @@
                                                   
 --]]
 
                                                   
 --]]
 

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

 local wibox        = require("wibox")
 
 local wibox        = require("wibox")
 

-local io           = io
+local io           = { open = io.open }

 local tonumber     = tonumber
 
 local setmetatable = setmetatable
 local tonumber     = tonumber
 
 local setmetatable = setmetatable


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

-    local timeout  = args.timeout or 5
+    local timeout  = args.timeout or 1
+    local tempfile = args.tempfile or "/sys/class/thermal/thermal_zone0/temp"

     local settings = args.settings or function() end
 
     temp.widget = wibox.widget.textbox('')
     local settings = args.settings or function() end
 
     temp.widget = wibox.widget.textbox('')

+    helpers.set_map("temp_last", 0)

 
     function update()
 
     function update()

-        local f = io.open("/sys/class/thermal/thermal_zone0/temp")
-        coretemp_now = tonumber(f:read("*all")) / 1000
-        f:close()
-        widget = temp.widget
-        settings()
+        local f = io.open(tempfile)
+        if f ~= nil
+        then
+            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

     end
 
     end
 

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

     return temp.widget
 end
 
     return temp.widget
 end