Version update to R24.6.6

This commit is contained in:
coolsnowwolf 2024-06-15 13:25:51 +08:00
parent e7b75aae80
commit ca0d93bec8
5 changed files with 11 additions and 9 deletions

View File

@ -738,7 +738,7 @@
<tr><td width="33%"><%:Local Time%></td><td id="localtime">-</td></tr> <tr><td width="33%"><%:Local Time%></td><td id="localtime">-</td></tr>
<tr><td width="33%"><%:Uptime%></td><td id="uptime">-</td></tr> <tr><td width="33%"><%:Uptime%></td><td id="uptime">-</td></tr>
<tr><td width="33%"><%:Load Average%></td><td id="loadavg">-</td></tr> <tr><td width="33%"><%:Load Average%></td><td id="loadavg">-</td></tr>
<tr><td width="33%"><%:CPU usage (%)%></td><td id="cpuusage">-</td></tr> <tr><td width="33%"><%:CPU usage%></td><td id="cpuusage">-</td></tr>
</table> </table>
</fieldset> </fieldset>

View File

@ -8,7 +8,7 @@ cpu_usage="$(top -n1 | awk '/^CPU/ {printf("%d%", 100 - $8)}')"
npu_usage="$(grep '%' "$NSS_PATH"/cpu_load_ubi | awk -F ' ' '{print $2}')" npu_usage="$(grep '%' "$NSS_PATH"/cpu_load_ubi | awk -F ' ' '{print $2}')"
if [ -d "$NSS_PATH" ]; then if [ -d "$NSS_PATH" ]; then
echo -n "CPU: ${cpu_usage}%, NPU: ${npu_usage}" echo -n "CPU: ${cpu_usage}, NPU: ${npu_usage}"
else else
echo -n "CPU: ${cpu_usage}%" echo -n "CPU: ${cpu_usage}"
fi fi

View File

@ -7,8 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=default-settings PKG_NAME:=default-settings
PKG_VERSION:=3 PKG_RELEASE:=$(COMMITCOUNT)
PKG_RELEASE:=12
PKG_LICENSE:=GPLv3 PKG_LICENSE:=GPLv3
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE

View File

@ -51,7 +51,7 @@ sed -i '/option disabled/d' /etc/config/wireless
sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh
sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release
echo "DISTRIB_REVISION='R24.5.1'" >> /etc/openwrt_release echo "DISTRIB_REVISION='R24.6.6'" >> /etc/openwrt_release
sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release
echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release

View File

@ -1,3 +1,6 @@
msgid "Swap"
msgstr "虚拟内存"
msgid "Processor" msgid "Processor"
msgstr "处理器" msgstr "处理器"
@ -13,6 +16,9 @@ msgstr "CPU 信息"
msgid "CPU Model" msgid "CPU Model"
msgstr "处理器型号" msgstr "处理器型号"
msgid "CPU usage"
msgstr "CPU 使用率"
msgid "CPU frequency" msgid "CPU frequency"
msgstr "CPU 频率" msgstr "CPU 频率"
@ -49,9 +55,6 @@ msgstr "划分给 ZRam 分区的内存大小MB推荐留空由系统自
msgid "Number of parallel threads used for compression" msgid "Number of parallel threads used for compression"
msgstr "用于压缩内存数据的CPU并发线程数" msgstr "用于压缩内存数据的CPU并发线程数"
msgid "Swap"
msgstr "虚拟内存"
msgid "Force 40MHz mode" msgid "Force 40MHz mode"
msgstr "强制 40MHz 频宽" msgstr "强制 40MHz 频宽"