From 78185f0e8ba5c1c6e7daa5b5a279c91fca078dbf Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 3 Dec 2023 10:17:44 -0600
Subject: [PATCH] Update powerwall.sh

---
 powerwall.sh | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/powerwall.sh b/powerwall.sh
index 6bace680..a6837437 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -606,7 +606,7 @@ CHECKPOWER(){
 		MSG="${idsCL[White]}ServerRack Wattage       ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT}`'watts ${idsCL[Default]}~ estimate"
 		echo -en "${MSG}"
 		if [ "${avgdays}" != "" ]; then
-			echo -en "${idsCL[LightYellow]}			Calculating average ...${idsCL[Default]}"
+			echo -en "${idsCL[LightYellow]}	Calculating average ...${idsCL[Default]}"
 			average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays}); average_disp="${idsCL[LightYellow]}	`IDS_NUMBER_FORMAT ${average}`'watts"
 			echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}"
 		fi
@@ -626,13 +626,14 @@ CHECKPOWER(){
 		fi
 
 		echo -e "${idsCL[White]}NetworkRack Amps         ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_AMP}`'amps ${idsCL[Default]}~ estimate${idsCL[Green]}${idsCL[Default]}"
+		MSG="${idsCL[White]}NetworkRack Wattage      ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 2 true`'watts ${idsCL[Default]}~ estimate"
+		echo -en "${MSG}"
 		if [ "${avgdays}" != "" ]; then
-			average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays})
-			average_disp="${idsCL[LightYellow]} 	`IDS_NUMBER_FORMAT ${average}`'watts"
-		else
-			average_disp=""
-		fi
-		echo -e "${idsCL[White]}NetworkRack Wattage      ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 2 true`'watts ${idsCL[Default]}~ estimate${idsCL[Green]}${average_disp}	${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${NETRK_WATT2}` watts)${idsCL[Default]}"
+			echo -en "${idsCL[LightYellow]} 	Calculating average ...${idsCL[Default]}"
+			average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['network-rack']} ${avgdays}); average_disp="${idsCL[LightYellow]} 	`IDS_NUMBER_FORMAT ${average}`'watts"
+			echo -en "\r\033[K"; echo -e "${MSG}${idsCL[LightYellow]}${average_disp}"
+		fi		
+		echo -e "${idsCL[Default]}"
 		
 		# echo
 		DIVIDER . lightCyan 75
@@ -700,15 +701,15 @@ CHECKPOWER(){
 		echo
 				
 		echo -e "${idsCL[White]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_AMPS}`'amps ${idsCL[Default]}~ estimate${idsCL[Green]}${idsCL[Default]}"
+		MSG="${idsCL[White]}Total Wattage            ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_WATTS}`'watts ${idsCL[Default]}~ estimate"
+		echo -en "${MSG}"
 		if [ "${avgdays}" != "" ]; then
-			average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['offsite-ups']} ${avgdays})
-			average_disp="${idsCL[LightYellow]}	`IDS_NUMBER_FORMAT ${average}`'watts"
-		else
-			average_disp=""
-		fi
-		echo -e "${idsCL[White]}Total Wattage            ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_WATTS}`'watts ${idsCL[Default]}~ estimate${idsCL[Green]}${average_disp}${idsCL[Default]}"
-		echo
-
+			echo -en "${idsCL[LightYellow]}		Calculating average ...${idsCL[Default]}"
+			average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['offsite-ups']} ${avgdays}); average_disp="${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${average}`'watts"
+			echo -en "\r\033[K"; echo -e "${MSG}${idsCL[LightYellow]}${average_disp}"
+		fi		
+		echo -e "${idsCL[Default]}\n"
+		
 		# echo -e "${idsCL[LightCyan]}Current Fan Speed        ${idsCL[Default]}: ${idsCL[Green]}${FanSpeed}%${idsCL[Default]}"
 		# echo
 	fi