From 5cc24a897a3c7b69e9c43bc5cbc876f4bbc64992 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 3 Dec 2023 16:49:03 -0600
Subject: [PATCH] update

---
 defaults.inc | 2 +-
 powerwall.sh | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index f1f8145e..6f41062c 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,5 +1,5 @@
 
-VERS='2.3.330-12032023'
+VERS='2.3.335-12032023'
 
 noheader=' update service dailytemp '
 
diff --git a/powerwall.sh b/powerwall.sh
index ccd8d12c..510f5400 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -92,8 +92,7 @@ CHECKTEMP(){
 				echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}"
 				
 				if [ "${SENSOR}" == "Powerwall-CPU" ] || [ "${SENSOR}" == "OctoPi-CPU" ]; then
-					[ "${SENSOR}" == "Powerwall-CPU" ] && SENSOR="Powerwall-CPU-Usage"
-					[ "${SENSOR}" == "OctoPi-CPU" ] && SENSOR="OctoPi-CPU-Usage"
+					SENSOR="${SENSOR}-Usage"
 					echo -en "${idsCL[Yellow]}Pulling data for '${SENSOR}' ... "
 					reading=$(CHECKTEMPSENSOR ${SENSOR})
 					c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; c=`expr ${c} + 1`; done
@@ -145,7 +144,7 @@ CHECKTEMPSENSOR(){
 		if [ "${1}" == "Powerwall-CPU-Usage" ]; then
 			temp_c=$(awk '{u=$2+$4; t=$2+$4+$5; if (NR==1){u1=u; t1=t;} else print ($2+$4-u1) * 100 / (t-t1) "%"; }' <(grep 'cpu ' /proc/stat) <(sleep 1;grep 'cpu ' /proc/stat) | sed -e 's/%//g')
 		else
-			temp_c=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${1}]} awk '{u=$2+$4; t=$2+$4+$5; if (NR==1){u1=u; t1=t;} else print ($2+$4-u1) * 100 / (t-t1) "%"; }' <(grep 'cpu ' /proc/stat) <(sleep 1;grep 'cpu ' /proc/stat) | sed -e 's/%//g')
+			temp_c=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${1}]} "/opt/idssys/defaults/get-data.sh cpu-usage")
 		fi
 		echo ${PW_TEMP_THRESHOLDS[${1}]} | cut -d',' -f 1 | read temp_warn
 		echo ${PW_TEMP_THRESHOLDS[${1}]} | cut -d',' -f 2 | read temp_crit