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

---
 powerwall.sh | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/powerwall.sh b/powerwall.sh
index 0b17e22d..6756d836 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -546,6 +546,8 @@ CHECKPOWER(){
 		echo -e "${idsCL[Yellow]}Mainsite Power Information				${avgdayshdr}"
 		DIVIDER . yellow 75
 		
+		echo -en "${idsCL[Yellow]}Pulling data from 'Powerwall' ... "
+		
 		INVSTATSINFO=$(curl -s "http://${PW_INVERTER_IP}/stats.json")
 		if [ "${INVSTATSINFO}" != "" ]; then
 			INPUTV=`echo ${INVSTATSINFO} | jq '.inputs .inV'`
@@ -570,7 +572,8 @@ CHECKPOWER(){
 				BATTA_disp="${idsCL[LightRed]}`IDS_NUMBER_FORMAT ${BATTA}`'amps ${idsCL[LightCyan]}- Discharging"
 			fi
 		fi
-
+		
+		echo -en "\r\033[K"
 		echo -e "${idsCL[White]}Inverter Input Volts     ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${INPUTV}`'volts"
 		echo -e "${idsCL[White]}Inverter Input Amps      ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${INPUTA}`'amps"
 		echo
@@ -583,6 +586,8 @@ CHECKPOWER(){
 		
 		# echo
 		DIVIDER . lightCyan 75
+		
+		echo -en "${idsCL[Yellow]}Pulling data from 'ServerRoom' ... "
 
 		# if [ "$(CHECK_HOST ${PW_UPS_IP})" != "false" ]; then
 			SVRRM_VOLTIN=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_UPS_IP} iso.3.6.1.4.1.850.1.1.3.1.3.2.2.1.3.1.1 | sed 's/.*: //')
@@ -601,7 +606,17 @@ CHECKPOWER(){
 			APCPDU_WATT2=$(snmpwalk  -t 1 -r 0 -v 1 -c public ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.1.16.0 | sed 's/.*: //')
 			APCPDU_WATT=`echo "scale=2; ${APCPDU_AMP}*${SVRRM_VOLTOUT}" | bc`
 		# fi
-
+		
+		if [ "${SVRRM_VOLTOUT}" != "" ]; then
+			if [ "${APCPDU_AMP}" != "" ]; then
+				NETRK_AMP=`echo "scale=2; ${SVRRM_AMP}-${APCPDU_AMP}" | bc`
+				NETRK_WATT=`echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT}" | bc`
+				NETRK_WATT2=`echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT2}" | bc`
+			fi
+			VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLTIN}" | bc`
+		fi
+		
+		echo -en "\r\033[K"
 		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"
@@ -615,18 +630,8 @@ CHECKPOWER(){
 		fi
 		echo -e "${idsCL[Default]}"
 		
-		# echo
 		DIVIDER . lightCyan 75
 		
-		if [ "${SVRRM_VOLTOUT}" != "" ]; then
-			if [ "${APCPDU_AMP}" != "" ]; then
-				NETRK_AMP=`echo "scale=2; ${SVRRM_AMP}-${APCPDU_AMP}" | bc`
-				NETRK_WATT=`echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT}" | bc`
-				NETRK_WATT2=`echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT2}" | bc`
-			fi
-			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 ${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}"
@@ -666,6 +671,8 @@ CHECKPOWER(){
 		DIVIDER . yellow 75
 		echo -e "${idsCL[Yellow]}Offsite Power Information				${avgdayshdr}"
 		DIVIDER . yellow 75
+		
+		echo -en "${idsCL[Yellow]}Pulling data from 'Offsite' ... "
 	
 		upsinfo=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 admin@10.2.1.1 'upsc CP1500PFCLCD')
 		if [ "$(echo "${upsinfo}" | grep 'input.voltage:')" != "" ]; then
@@ -695,7 +702,8 @@ CHECKPOWER(){
 			# OFFSITE_BATT_CAP=$(snmpwalk  -t 1 -r 0 -v 1 -c public 10.2.1.100 iso.3.6.1.2.1.33.1.2.4.0 | sed 's/.*: //')
 		
 		fi
-	
+		
+		echo -en "\r\033[K"
 		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