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

---
 powerwall.sh | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/powerwall.sh b/powerwall.sh
index 3a6b206e..921582d5 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -602,13 +602,16 @@ CHECKPOWER(){
 		# fi
 
 		echo -e "${idsCL[White]}ServerRack Amps          ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_AMP}`'amps${idsCL[Default]}"
+		
+		MSG="${idsCL[White]}ServerRack Wattage       ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT}`'watts ${idsCL[Default]}~ estimate"
+		echo -en "${MSG}"
 		if [ "${avgdays}" != "" ]; then
-			average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays})
-			average_disp="${idsCL[LightYellow]}	`IDS_NUMBER_FORMAT ${average}`'watts"
-		else
-			average_disp=""
+			"${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
-		echo -e "${idsCL[White]}ServerRack Wattage       ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT}`'watts ${idsCL[Default]}~ estimate${idsCL[Green]}${average_disp}	${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${APCPDU_WATT2}` watts)${idsCL[Default]}"
+		echo -e "	${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${APCPDU_WATT2}` watts)${idsCL[Default]}"
+		echo	
 		
 		# echo
 		DIVIDER . lightCyan 75
@@ -639,15 +642,14 @@ CHECKPOWER(){
 		echo -e "${idsCL[LightCyan]}Voltage Drop             ${idsCL[Default]}: ${idsCL[LightRed]}${VOLT_DROP}'volts${idsCL[Default]}"
 		echo -e "${idsCL[White]}Server Room Amps         ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'amps${idsCL[Default]}"
 		
+		MSG="${idsCL[White]}Server Room Wattage      ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT}`'watts"
+		echo -en "${MSG}"
 		if [ "${avgdays}" != "" ]; then
-			echo -en "${idsCL[White]}Server Room Wattage      ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT}`'watts${idsCL[LightYellow]}			Calculating averages ...${idsCL[Default]}"
-			average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total']} ${avgdays})
-			average_disp="${idsCL[LightYellow]}			`IDS_NUMBER_FORMAT ${average}`'watts"
-			echo -en "\r\033[K"
-			echo -e "${idsCL[White]}Server Room Wattage      ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT}`'watts${idsCL[LightYellow]}${average_disp}${idsCL[Default]}"
-			
+			"${idsCL[LightYellow]}			Calculating average ...${idsCL[Default]}"
+			average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total']} ${avgdays}); average_disp="${idsCL[LightYellow]}			`IDS_NUMBER_FORMAT ${average}`'watts"
+			echo -en "\r\033[K"; echo -e "${MSG}${idsCL[LightYellow]}${average_disp}${idsCL[Default]}"
 		else
-			echo -e "${idsCL[White]}Server Room Wattage      ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT}`'watts${idsCL[Default]}"
+			echo -e "${idsCL[Default]}"
 		fi
 		echo