From 6c2ffa6cf05ef0209e029c8c938a01633879907a Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Sun, 10 Dec 2023 18:49:51 +0100 Subject: [PATCH] Display core temp when available in all cases --- .../files/usr/libexec/rpcd/openmptcprouter | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter b/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter index 340fbf77c..f28df60c1 100755 --- a/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter +++ b/openmptcprouter-api/files/usr/libexec/rpcd/openmptcprouter @@ -8,6 +8,11 @@ local net = require "luci.model.network".init() local ucic = require "luci.model.uci".cursor() local jsonc = require "luci.jsonc" +function file_exists(name) + local f = io.open(name, "r") + return f ~= nil and io.close(f) +end + function interface_from_device(dev) for _, iface in ipairs(net:get_networks()) do local ifacen = iface:name() @@ -1183,7 +1188,8 @@ function interfaces_status() mArray.openmptcprouter['model'] = sys.exec("ubus call system board | jsonfilter -q -e '@.model' 2>/dev/null | tr -d '\n'") local board_name = sys.exec("ubus call system board | jsonfilter -q -e '@.board_name' 2>/dev/null | tr -d '\n'") -- retrieve core temperature - if board_name:match("^raspberrypi.*") then + --if board_name:match("^raspberrypi.*") then + if file_exists("/sys/class/thermal/thermal_zone0/temp") then mArray.openmptcprouter["core_temp"] = sys.exec("cat /sys/class/thermal/thermal_zone0/temp 2>/dev/null"):match("%d+") end mArray.openmptcprouter["loadavg"] = sys.exec("cat /proc/loadavg 2>/dev/null"):match("[%d%.]+ [%d%.]+ [%d%.]+")