From 7c677b57877ddf2c69fe5f96fc3e2ff63bef509a Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 1 Nov 2023 19:18:43 -0500
Subject: [PATCH] Update powerwall.sh

---
 powerwall.sh | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/powerwall.sh b/powerwall.sh
index bc67114f..c9e378ff 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -614,24 +614,31 @@ CHECKPOWER(){
 		echo
 	fi
 	
-	######
+	########
 	
 	DIVIDER . yellow 75
 	echo -e "${idsCL[Yellow]}Offsite Power Information"
 	DIVIDER true yellow 75
 	
 	if [ "$(CHECK_HOST 10.2.1.100)" != "false" ]; then
-		SVRRM_VOLT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.2.1.1 | sed 's/.*: //')
-		SVRRM_VOLT=`echo "scale=1; ${SVRRM_VOLT}/10" | bc`
-		SVRRM_WATT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.4.1.1 | sed 's/.*: //')
-		[[ "${SVRRM_WATT}" == *"."* ]] && [[ "${SVRRM_WATT}" != *".0"* ]] && SVRRM_WATT_disp=`printf "%'.1f\n" ${SVRRM_WATT}` || SVRRM_WATT_disp=`printf "%'.0f\n" ${SVRRM_WATT}`
-		SVRRM_AMP=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.4.1.850.1.1.3.1.3.3.2.1.3.1.1 | sed 's/.*: //')
-		SVRRM_AMP=`echo "scale=2; ${SVRRM_AMP}/100" | bc`
+		OFFSITE_VOLTIN=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.4.1.3808.1.1.1.3.2.1.0 | sed 's/.*: //')
+		OFFSITE_VOLTIN=`echo "scale=1; ${OFFSITE_VOLTIN}/10" | bc`
+		OFFSITE_VOLTOUT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.4.1.3808.1.1.1.4.2.1.0 | sed 's/.*: //')
+		OFFSITE_VOLTOUT=`echo "scale=1; ${OFFSITE_VOLTOUT}/10" | bc`	
+		OFFSITE_LOAD=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.4.1.3808.1.1.1.4.2.3.0 | sed 's/.*: //')
+		OFFSITE_WATTS=`echo "scale=1; (${OFFSITE_LOAD}/100)*900" | bc`	
+		OFFSITE_AMPS=`echo "scale=1; ${OFFSITE_WATTS}/${OFFSITE_VOLTOUT}" | bc`	
+		
 	fi
 	
+	echo -e "${idsCL[LightCyan]}UPS Voltage In           ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_VOLTIN}'V${idsCL[Default]}"
+	echo -e "${idsCL[LightCyan]}UPS Voltage Out          ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_VOLTOUT}'V${idsCL[Default]}"
+	echo -e "${idsCL[LightCyan]}Total Amps ~             ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_AMPS}'A${idsCL[Default]}"
+	echo -e "${idsCL[LightCyan]}Total Wattage ~          ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_WATTS}'W${idsCL[Default]}"
+	echo	
 	
 	
-	
+	########
 		
 	if [ "${1}" == "" ] || [ "${1}" == "hosts" ]; then
 		finalcheck=""