Merge pull request #279 from renatofdds/patch-1

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

diff --git a/widgets/temp.lua b/widgets/temp.lua
index 5994f59a36f659aa274dba2f274ba8c619e2eb9e..cdf30021bf42a4030d3695a3b785ee23f08e6c9d 100644 (file)
--- a/widgets/temp.lua
+++ b/widgets/temp.lua
@@ -7,12 +7,9 @@
 --]]
 
 local newtimer     = require("lain.helpers").newtimer
 --]]
 
 local newtimer     = require("lain.helpers").newtimer

-

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

-

 local io           = { open = io.open }
 local tonumber     = tonumber
 local io           = { open = io.open }
 local tonumber     = tonumber

-

 local setmetatable = setmetatable
 
 -- coretemp
 local setmetatable = setmetatable
 
 -- coretemp


@@ -21,17 +18,16 @@ 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
 

-    temp.widget = wibox.widget.textbox('')
+    temp.widget = wibox.widget.textbox()

 
     function update()
         local f = io.open(tempfile)
 
     function 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"
             f:close()
         else
             coretemp_now = "N/A"


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

+

     return temp.widget
 end
 
     return temp.widget
 end