X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/0ef82f83e0baaa2936b6204a24ee3b3b638fd409..c959fc72b053b09a1f08bcb070cd360cc1c975ad:/widgets/cpu.lua?ds=inline

diff --git a/widgets/cpu.lua b/widgets/cpu.lua
index f307b26..ec84101 100644
--- a/widgets/cpu.lua
+++ b/widgets/cpu.lua
@@ -28,12 +28,12 @@ local cpu = {
 
 local function worker(args)
     local args     = args or {}
-    local timeout  = args.timeout or 5
+    local timeout  = args.timeout or 2
     local settings = args.settings or function() end
 
     cpu.widget = wibox.widget.textbox('')
 
-    function cpu.update()
+    function update()
         -- Read the amount of time the CPUs have spent performing
         -- different kinds of work. Read the first line of /proc/stat
         -- which is the sum of all CPUs.
@@ -43,9 +43,9 @@ local function worker(args)
         local total = 0
         for field in string.gmatch(times, "[%s]+([^%s]+)")
         do
-            -- 3 = idle, 4 = ioWait. Essentially, the CPUs have done
+            -- 4 = idle, 5 = ioWait. Essentially, the CPUs have done
             -- nothing during these times.
-            if at == 3 or at == 4
+            if at == 4 or at == 5
             then
                 idle = idle + field
             end
@@ -58,7 +58,8 @@ local function worker(args)
         local dactive = active - cpu.last_active
         local dtotal = total - cpu.last_total
 
-        usage = tostring(math.ceil((dactive / dtotal) * 100))
+        cpu_now = {}
+        cpu_now.usage = tostring(math.ceil((dactive / dtotal) * 100))
 
         widget = cpu.widget
         settings()
@@ -68,7 +69,7 @@ local function worker(args)
         cpu.last_total = total
     end
 
-    newtimer("cpu", timeout, cpu.update)
+    newtimer("cpu", timeout, update)
 
     return cpu.widget
 end