From f59fe54f660afc10961cdda32e8059c3714d8697 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 31 Oct 2023 13:01:10 -0500
Subject: [PATCH] Update powerwall.sh

---
 powerwall.sh | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/powerwall.sh b/powerwall.sh
index fd62b495..2da5f3c2 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -538,6 +538,9 @@ CHECKPOWER(){
 	done
 	check_GETHOSTPOWER &
 	
+	echo -e "\n${idsCL[Yellow]}Power Information"
+	DIVIDER . yellow 75
+		
 	if [ "${1}" == "" ] || [ "${1}" == "sensors" ]; then
 		if [ "$(CHECK_HOST inv1.scity.us)" != "false" ]; then
 			INVSTATSINFO=$(curl -s "https://inv1.scity.us/stats.json")
@@ -549,7 +552,12 @@ CHECKPOWER(){
 			BATTV=`echo ${INVSTATSINFO} | jq '.inputs .battV'`
 			BATTA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'`
 		fi
-
+		
+		echo -e "${idsCL[LightCyan]}Inverter Input Power     ${idsCL[Default]}: ${idsCL[Green]}${INPUTV}V / ${INPUTA} A"
+		echo -e "${idsCL[LightCyan]}Inverter Output Power    ${idsCL[Default]}: ${idsCL[Green]}${OUTPUTV}V (${OUTPUTV2}V) / ${OUTPUTA} A (${OUTPUTA2} A @ ${OUTPUTV2} V)"
+		echo -e "${idsCL[LightCyan]}Battery Power            ${idsCL[Default]}: ${idsCL[Green]}${BATTV}V / ${BATTA} A ${idsCL[Default]}"
+		echo
+		
 		if [ "$(CHECK_HOST 10.10.1.205)" != "false" ]; then
 			SVRRM_VOLT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.2.1.33.1.4.4.1.2.1 | sed 's/.*: //')
 			SVRRM_WATT=$(snmpwalk -v 1 -c public 10.10.1.205 iso.3.6.1.2.1.33.1.4.4.1.4.1 | sed 's/.*: //')
@@ -563,7 +571,11 @@ CHECKPOWER(){
 			# APCPDU_WATT=$(snmpwalk -v 1 -c public 10.10.1.210 .1.3.6.1.4.1.318.1.1.12.1.16.0 | sed 's/.*: //')
 			APCPDU_WATT=`echo "scale=1; ${APCPDU_AMP}*${SVRRM_VOLT}" | bc`
 		fi
-
+		
+		echo -e "${idsCL[LightCyan]}ServerRack Amps          ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP} A${idsCL[Default]}"
+		echo -e "${idsCL[LightCyan]}ServerRack Wattage       ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_WATT} W${idsCL[Default]}"
+		echo
+		
 		if [ "$(CHECK_HOST 10.10.1.205)" != "false" ]; then
 			if [ "$(CHECK_HOST 10.10.1.210)" != "false" ]; then
 				NETRK_AMP=`echo "scale=1; ${SVRRM_AMP}-${APCPDU_AMP}" | bc`
@@ -572,20 +584,10 @@ CHECKPOWER(){
 			VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLT}" | bc`
 		fi
 
-		echo
-		echo -e "${idsCL[Yellow]}Power Information"
-		DIVIDER . yellow 75
-
-		echo -e "${idsCL[LightCyan]}Inverter Input Power     ${idsCL[Default]}: ${idsCL[Green]}${INPUTV}V / ${INPUTA} A"
-		echo -e "${idsCL[LightCyan]}Inverter Output Power    ${idsCL[Default]}: ${idsCL[Green]}${OUTPUTV}V (${OUTPUTV2}V) / ${OUTPUTA} A (${OUTPUTA2} A @ ${OUTPUTV2} V)"
-		echo -e "${idsCL[LightCyan]}Battery Power            ${idsCL[Default]}: ${idsCL[Green]}${BATTV}V / ${BATTA} A ${idsCL[Default]}"
-		echo
-		echo -e "${idsCL[LightCyan]}ServerRack Amps          ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP} A${idsCL[Default]}"
-		echo -e "${idsCL[LightCyan]}ServerRack Wattage       ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_WATT} W${idsCL[Default]}"
-		echo
 		echo -e "${idsCL[LightCyan]}NetworkRack Amps         ${idsCL[Default]}: ${idsCL[Green]}${NETRK_AMP} A${idsCL[Default]}"
 		echo -e "${idsCL[LightCyan]}NetworkRack Wattage      ${idsCL[Default]}: ${idsCL[Green]}${NETRK_WATT} W${idsCL[Default]}"
 		echo
+		
 		echo -e "${idsCL[LightCyan]}Voltage                  ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLT} V${idsCL[Default]}"
 		echo -e "${idsCL[LightCyan]}Voltage Drop             ${idsCL[Default]}: ${idsCL[Red]}${VOLT_DROP} V${idsCL[Default]}"
 		echo -e "${idsCL[LightCyan]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP} A${idsCL[Default]}"