Merge branch 'andering-patch-3'

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

diff --git a/widgets/temp.lua b/widgets/temp.lua
index 4ae1c04ed574a4ffd64f7566155cd8cf22015f0a..a857e71e3de7f80167df6c67817c9f24d9290b8f 100644 (file)
--- a/widgets/temp.lua
+++ b/widgets/temp.lua
@@ -10,7 +10,7 @@ local newtimer     = require("lain.helpers").newtimer
 
 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,7 +21,7 @@ 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 2

     local tempfile = args.tempfile or "/sys/class/thermal/thermal_zone0/temp"
     local settings = args.settings or function() end
 
     local tempfile = args.tempfile or "/sys/class/thermal/thermal_zone0/temp"
     local settings = args.settings or function() end
 


@@ -31,7 +31,7 @@ local function worker(args)
         local f = io.open(tempfile)
         if f ~= nil
         then
         local f = io.open(tempfile)
         if f ~= nil
         then

-            coretemp_now = tonumber(f:read("*a")) / 1000
+            coretemp_now = tonumber(f:read("*all")) / 1000

             f:close()
         else
             coretemp_now = "N/A"
             f:close()
         else
             coretemp_now = "N/A"


@@ -42,6 +42,7 @@ local function worker(args)
     end
 
     newtimer("coretemp", timeout, update)
     end
 
     newtimer("coretemp", timeout, update)

+

     return temp.widget
 end
 
     return temp.widget
 end