From 748da2f4a7971a1b58480faca73a672b0163df4f Mon Sep 17 00:00:00 2001 From: DrUm78 Date: Mon, 14 Jul 2025 21:08:42 +0200 Subject: [PATCH] Revert "Replaced swap amount by CPU temperature in system_stats" This reverts commit 658e99ca52e62958460376c67021ccd5a2f04031. --- .../board/funkey/rootfs-overlay/usr/local/sbin/system_stats | 6 +++--- .../board/funkey/rootfs-overlay/usr/local/sbin/system_stats | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/system_stats b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/system_stats index 8f054a9..3a75ee5 100755 --- a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/system_stats +++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/system_stats @@ -40,7 +40,7 @@ while true; do # Compute stats cpu=$(printf "%.0f\n" $(mpstat -P ALL $UPDATE_PERIOD 1 | tail -1 | awk '{print 100-$12}')) ram_mem=$(printf "%.0f\n" $(free | grep Mem | awk '{print $3/$2 * 100.0}')) - temp=$(printf "%.0f" $(printf "(%d*0.1)-144.7" $(i2cget -y -f 0 0x34 0x5E w|awk '{print "0x"substr($0,5,2)substr($0,4,1)}') | bc)) + ram_swap=$(printf "%.0f\n" $(free | grep Swap | awk '{print $3/$2 * 100.0}')) battery=$(printf "%.0f\n" $(cat /sys/class/power_supply/axp20x-battery/capacity)) ip_addr=$(ifconfig usb0 | grep "inet " | awk -F'[: ]+' '{ print $4 }') @@ -50,9 +50,9 @@ while true; do notif_dirty=0 else if [ "x${ip_addr}" != "x" ]; then - notif set 0 "CPU:${cpu} RAM:${ram_mem} TEMP:${temp} BAT:${battery}^IP:${ip_addr}" + notif set 0 "CPU:${cpu} RAM:${ram_mem} SWAP:${ram_swap} BAT:${battery}^IP:${ip_addr}" else - notif set 0 "CPU:${cpu} RAM:${ram_mem} TEMP:${temp} BAT:${battery}" + notif set 0 "CPU:${cpu} RAM:${ram_mem} SWAP:${ram_swap} BAT:${battery}" fi fi else diff --git a/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/system_stats b/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/system_stats index 8f054a9..3a75ee5 100755 --- a/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/system_stats +++ b/Recovery/board/funkey/rootfs-overlay/usr/local/sbin/system_stats @@ -40,7 +40,7 @@ while true; do # Compute stats cpu=$(printf "%.0f\n" $(mpstat -P ALL $UPDATE_PERIOD 1 | tail -1 | awk '{print 100-$12}')) ram_mem=$(printf "%.0f\n" $(free | grep Mem | awk '{print $3/$2 * 100.0}')) - temp=$(printf "%.0f" $(printf "(%d*0.1)-144.7" $(i2cget -y -f 0 0x34 0x5E w|awk '{print "0x"substr($0,5,2)substr($0,4,1)}') | bc)) + ram_swap=$(printf "%.0f\n" $(free | grep Swap | awk '{print $3/$2 * 100.0}')) battery=$(printf "%.0f\n" $(cat /sys/class/power_supply/axp20x-battery/capacity)) ip_addr=$(ifconfig usb0 | grep "inet " | awk -F'[: ]+' '{ print $4 }') @@ -50,9 +50,9 @@ while true; do notif_dirty=0 else if [ "x${ip_addr}" != "x" ]; then - notif set 0 "CPU:${cpu} RAM:${ram_mem} TEMP:${temp} BAT:${battery}^IP:${ip_addr}" + notif set 0 "CPU:${cpu} RAM:${ram_mem} SWAP:${ram_swap} BAT:${battery}^IP:${ip_addr}" else - notif set 0 "CPU:${cpu} RAM:${ram_mem} TEMP:${temp} BAT:${battery}" + notif set 0 "CPU:${cpu} RAM:${ram_mem} SWAP:${ram_swap} BAT:${battery}" fi fi else