From 72d273df4b4abd3b1357813dcfc9513c08ef10a6 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Fri, 1 Dec 2023 11:34:58 -0600
Subject: [PATCH] Update powerwall.sh

---
 powerwall.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/powerwall.sh b/powerwall.sh
index 12fe73f5..aa57c46f 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -608,7 +608,7 @@ CHECKPOWER(){
 		else
 			average_disp=""
 		fi
-		echo -e "${idsCL[White]}ServerRack Wattage       ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT}`'watts ~ estimate${average_disp}	${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${APCPDU_WATT2}` watts)${idsCL[Default]}"
+		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
 		DIVIDER . lightCyan 75
@@ -622,14 +622,14 @@ CHECKPOWER(){
 			VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLTIN}" | bc`
 		fi
 
-		echo -e "${idsCL[White]}NetworkRack Amps         ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_AMP}`'amps ~ estimate${idsCL[Default]}"
+		echo -e "${idsCL[White]}NetworkRack Amps         ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_AMP}`'amps ${idsCL[Default]}~ estimate${idsCL[Green]}${idsCL[Default]}"
 		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 ~ estimate${average_disp}	${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${NETRK_WATT2}` watts)${idsCL[Default]}"
+		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
 		DIVIDER . lightCyan 75
@@ -688,14 +688,14 @@ CHECKPOWER(){
 		echo -e "${idsCL[White]}UPS Voltage In           ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_VOLTIN}`'volts${idsCL[Default]}"
 		echo -e "${idsCL[White]}UPS Voltage Out          ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_VOLTOUT}`'volts${idsCL[Default]}"
 		echo
-		echo -e "${idsCL[White]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_AMPS}`'amps ~ estimate${idsCL[Default]}"
+		echo -e "${idsCL[White]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_AMPS}`'amps ${idsCL[Default]}~ estimate${idsCL[Green]}${idsCL[Default]}"
 		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 ~ estimate${average_disp}${idsCL[Default]}"
+		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 -e "${idsCL[White]}Battery Capacity         ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_BATT_CAP}`%${idsCL[Default]}"
 		echo -e "${idsCL[White]}Battery Runtime          ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_RUNTIME}'Mins${idsCL[Default]}"