fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autocore-raspberrypi: show CPU info in Architecture

Browse Source
This commit is contained in:
CN_SZTL 2020-05-31 09:20:23 +08:00
parent f69592eaf0
commit 4476de3bb7
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/lean/autocore/Makefile
View File

@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/autocore-raspberrypi
TITLE:=RaspberryPi auto core loadbalance script.
MAINTAINER:=CN_SZTL
DEPENDS:=@TARGET_bcm27xx
DEPENDS:=@TARGET_bcm27xx +bcm27xx-userland
endef
define Package/autocore-x86

11
package/lean/autocore/files/raspberrypi/index.htm
View File

@ -50,11 +50,8 @@
local cpu_usage = (luci.sys.exec("expr 100 - $(top -n 1 | grep 'CPU:' | awk -F '%' '{print$4}' | awk -F ' ' '{print$2}')") or "6") .. "%"
local cpu_info = luci.sys.exec("cpuinfo")
local rv = {
cpuusage = cpu_usage,
cpuinfo = cpu_info,
userinfo = user_info,
systemp = sys_temp,
uptime = sysinfo.uptime or 0,
@ -648,9 +645,6 @@
if (e = document.getElementById('cpuusage'))
e.innerHTML = info.cpuusage;
if (e = document.getElementById('cpuinfo'))
e.innerHTML = info.cpuinfo;
if (e = document.getElementById('loadavg'))
e.innerHTML = String.format(
'%.02f, %.02f, %.02f',
@ -697,9 +691,8 @@
<table width="100%" cellspacing="10">
<tr><td width="33%"><%:Hostname%></td><td><%=luci.sys.hostname() or "?"%></td></tr>
<tr><td width="33%"><%:Model%></td><td><%=pcdata(boardinfo.model or "?")%> <%=luci.sys.exec("cat /etc/bench.log") or " "%></td></tr>
<tr><td width="33%"><%:Architecture%></td><td><%=pcdata(boardinfo.system or "ARMv8 Processor")%> x <%=luci.sys.exec("cat /proc/cpuinfo | grep 'processor' | wc -l") or "1"%></td></tr>
<tr><td width="33%"><%:CPU Info%></td><td id="cpuinfo">-</td></tr>
<tr><td width="33%"><%:Model%></td><td><%=pcdata(boardinfo.model or "?")%> <%=luci.sys.exec("cat /etc/bench.log") or ""%></td></tr>
<tr><td width="33%"><%:Architecture%></td><td><%=pcdata(boardinfo.system or "ARMv8 Processor")%> x <%=luci.sys.exec("cat /proc/cpuinfo | grep 'processor' | wc -l") or "1"%> <%=luci.sys.exec("cpuinfo") or ""%></td></tr>
<tr><td width="33%"><%:Firmware Version%></td><td>
<%=pcdata(ver.distname)%> <%=pcdata(ver.distversion)%><!-- /
<%=pcdata(ver.luciname)%> (<%=pcdata(ver.luciversion)%>) !-->

2
package/lean/autocore/files/raspberrypi/sbin/cpuinfo
View File

@ -8,4 +8,4 @@ else
sys_temp="$(awk "BEGIN{printf (\"%.1f\n\",$(cat /sys/class/thermal/thermal_zone0/temp)/1000) }")°C"
fi
echo -n "${cpu_freq} | ${sys_temp}"
echo -n "(${cpu_freq}, ${sys_temp})"