]> git.madduck.net Git - etc/awesome.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

widget.temp: re-add tempfile argument (#432), but keep retrieving all temperature...
authorLuca Capezzuto <luca.capezzuto@soton.ac.uk>
Wed, 29 May 2019 14:28:38 +0000 (15:28 +0100)
committerLuca Capezzuto <luca.capezzuto@soton.ac.uk>
Wed, 29 May 2019 14:29:27 +0000 (15:29 +0100)
widget/temp.lua
wiki

index 513bd3849bb8226e6b382bb93433f72ec85bbea0..e909b322f14a197b1d51f4448dc845ab18df1069 100644 (file)
@@ -9,26 +9,28 @@ local helpers  = require("lain.helpers")
 local wibox    = require("wibox")
 local tonumber = tonumber
 
 local wibox    = require("wibox")
 local tonumber = tonumber
 
--- coretemp
+-- {thermal,core} temperature info
 -- lain.widget.temp
 
 local function factory(args)
 -- lain.widget.temp
 
 local function factory(args)
-    local temp         = { widget = wibox.widget.textbox() }
-    local args         = args or {}
-    local timeout      = args.timeout or 30
-    local settings     = args.settings or function() end
+    local temp     = { widget = wibox.widget.textbox() }
+    local args     = args or {}
+    local timeout  = args.timeout or 30
+    local tempfile = args.tempfile or "/sys/devices/virtual/thermal/thermal_zone0/temp"
+    local settings = args.settings or function() end
 
     function temp.update()
 
     function temp.update()
-        helpers.async({"find", "/sys/devices", "-name", "temp"}, function(f)
+        helpers.async({"find", "/sys/devices", "-type", "f", "-name", "*temp*"}, function(f)
             temp_now = {}
             temp_now = {}
-            local temp_value
+            local temp_fl, temp_value
             for t in f:gmatch("[^\n]+") do
             for t in f:gmatch("[^\n]+") do
-                temp_value = helpers.first_line(t)
-                if temp_value then
-                    temp_now[tonumber(t:match("%d+"))] = temp_value / 1e3
+                temp_fl = helpers.first_line(t)
+                if temp_fl then
+                    temp_value = tonumber(temp_fl)
+                    temp_now[t] = temp_value and temp_value/1e3 or temp_fl
                 end
             end
                 end
             end
-            coretemp_now = temp_now[0] or "N/A"
+            coretemp_now = temp_now[tempfile] or "N/A"
             widget = temp.widget
             settings()
         end)
             widget = temp.widget
             settings()
         end)
diff --git a/wiki b/wiki
index aaeceb1598cbbc27b1ee79d9a8d483fd10a4187a..d7fd4db9122b26e8e8408f3515a0cb1cdb8b03e6 160000 (submodule)
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit aaeceb1598cbbc27b1ee79d9a8d483fd10a4187a
+Subproject commit d7fd4db9122b26e8e8408f3515a0cb1cdb8b03e6