From 0d8e196771188756737ff3fbebe5e1961e54492b Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 11 Feb 2024 09:07:53 -0600
Subject: [PATCH] Update power.inc.sh

---
 inc/power.inc.sh | 39 ++++++++++++++++-----------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 9b9b1263..7f95c33c 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -228,35 +228,28 @@ CHECKPOWER(){
 			AD=$(IDS_NUMBER_FORMAT ${AIRCON_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
 			echo -e "${idsCL[White]}Air Conditioner          ${idsCL[Default]}: ${idsCL[Green]}${AD}'amps${spc}${idsCL[Green]}`IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'watts ${idsCL[Default]}"
 			
-			
-			
+			DIVIDER . lightCyan ${PRI_WIDTH}
+			if [ "${avgdays}" != "" ]; then
+				echo -en "${idsCL[Yellow]}Calculating Server Room Total Averages  ... "
+				SVRRM_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total']} ${avgdays} both)
+				SVRRM_AMP_avg=$(echo ${SVRRM_avg} | cut -d'~' -f 1)
+				SVRRM_WATT_avg=$(echo ${SVRRM_avg} | cut -d'~' -f 2)
+				SVRRM_WAC_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total-wac']} ${avgdays} both)
+				SVRRM_AMP_WAC_avg=$(echo ${SVRRM_WAC_avg} | cut -d'~' -f 1)
+				SVRRM_WATT_WAC_avg=$(echo ${SVRRM_WAC_avg} | cut -d'~' -f 2)
+				echo -en "\r\033[K"
+			fi
+			AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+			echo -e "${idsCL[White]}Server Room              ${idsCL[Default]}: ${idsCL[Green]}${AD}'amps${spc}${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'watts ${idsCL[Default]}"
+			AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP_WAC} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+			echo -e "${idsCL[White]}Server Room w/AIR        ${idsCL[Default]}: ${idsCL[Green]}${AD}'amps${spc}${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'watts ${idsCL[Default]}"
 			DIVIDER . lightCyan ${PRI_WIDTH}
 		fi
-		if [ "${avgdays}" != "" ]; then
-			echo -en "${idsCL[Yellow]}Calculating Server Room Total Averages  ... "
-			SVRRM_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total']} ${avgdays} both)
-			SVRRM_AMP_avg=$(echo ${SVRRM_avg} | cut -d'~' -f 1)
-			SVRRM_WATT_avg=$(echo ${SVRRM_avg} | cut -d'~' -f 2)
-			SVRRM_WAC_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total-wac']} ${avgdays} both)
-			SVRRM_AMP_WAC_avg=$(echo ${SVRRM_WAC_avg} | cut -d'~' -f 1)
-			SVRRM_WATT_WAC_avg=$(echo ${SVRRM_WAC_avg} | cut -d'~' -f 2)
-			echo -en "\r\033[K"
-		fi
+
 		echo -e "${idsCL[White]}Server Room Voltage IN   ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLTIN}'volts${idsCL[Default]}"
 		echo -e "${idsCL[White]}Server Room Voltage OUT  ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLTOUT}'volts${idsCL[Default]}"
 		[ ${REPORT} -eq 0 ] && echo -e "${idsCL[White]}Voltage Drop             ${idsCL[Default]}: ${idsCL[LightRed]}${VOLT_DROP}'volts${idsCL[Default]}"
 		
-		
-		echo -en "${idsCL[White]}Server Room Amps         ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'amps${idsCL[Default]}"
-		[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}			`IDS_NUMBER_FORMAT ${SVRRM_AMP_avg}`'amps${idsCL[Default]}" || echo -e "${idsCL[Default]}"
-		echo -en "${idsCL[LightCyan]} Total with AirCond      ${idsCL[Default]}: ${idsCL[LightCyan]}${SVRRM_AMP_WAC}'amps"
-		[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}			`IDS_NUMBER_FORMAT ${SVRRM_AMP_WAC_avg}`'amps${idsCL[Default]}" || echo -e "${idsCL[Default]}"
-		
-		echo -en "${idsCL[White]}Server Room Wattage      ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'watts"
-		[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}			`IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 0`'watts${idsCL[Default]}" || echo -e "${idsCL[Default]}"
-		echo -en "${idsCL[LightCyan]} Total with AirCond      ${idsCL[Default]}: ${idsCL[LightCyan]}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'watts"
-		[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}			`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 0`'watts${idsCL[Default]}" || echo -e "${idsCL[Default]}"
-		
 		[ ${REPORT} -eq 0 ] && echo
 		
 	fi