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

---
 powerwall.sh | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/powerwall.sh b/powerwall.sh
index 4697f0ce..2da5f3c2 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -542,6 +542,21 @@ CHECKPOWER(){
 	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")
+			INPUTV=`echo ${INVSTATSINFO} | jq '.inputs .inV'`
+			INPUTA=`echo ${INVSTATSINFO} | jq '.inputs .inA'`
+			OUTPUTV=`echo ${INVSTATSINFO} | jq '.outputs .outV'`
+			OUTPUTV2=`echo "scale=1; ${OUTPUTV}/2" | bc`
+			OUTPUTA=`echo ${INVSTATSINFO} | jq '.outputs .outA'`
+			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/.*: //')
@@ -573,22 +588,6 @@ CHECKPOWER(){
 		echo -e "${idsCL[LightCyan]}NetworkRack Wattage      ${idsCL[Default]}: ${idsCL[Green]}${NETRK_WATT} W${idsCL[Default]}"
 		echo
 		
-		if [ "$(CHECK_HOST inv1.scity.us)" != "false" ]; then
-			INVSTATSINFO=$(curl -s "https://inv1.scity.us/stats.json")
-			INPUTV=`echo ${INVSTATSINFO} | jq '.inputs .inV'`
-			INPUTA=`echo ${INVSTATSINFO} | jq '.inputs .inA'`
-			OUTPUTV=`echo ${INVSTATSINFO} | jq '.outputs .outV'`
-			OUTPUTV2=`echo "scale=1; ${OUTPUTV}/2" | bc`
-			OUTPUTA=`echo ${INVSTATSINFO} | jq '.outputs .outA'`
-			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
-				
 		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]}"