From 086a5c963b09a7bf731853cc9c15e854c276dd13 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sun, 11 Feb 2024 10:30:59 -0600
Subject: [PATCH] Update power.inc.sh

---
 inc/power.inc.sh | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 723cc2ba..59d6a0c0 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -315,13 +315,6 @@ CHECKPOWER(){
 		fi
 		
 		[ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
-		if [ "${avgdays}" != "" ]; then
-			echo -en "${idsCL[Yellow]}Calculating Offsite Averages  ... "
-			OFFSITE_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['offsite-ups']} ${avgdays} both)
-			OFFSITE_AMP_avg=$(echo ${OFFSITE_avg} | cut -d'~' -f 1)
-			OFFSITE_WATT_avg=$(echo ${OFFSITE_avg} | cut -d'~' -f 2)
-			echo -en "\r\033[K"
-		fi
 		
 		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]}"
@@ -330,8 +323,28 @@ CHECKPOWER(){
 		echo -e "${idsCL[White]}Battery Capacity         ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_BATT_CAP}`%${idsCL[Default]}"
 		echo -e "${idsCL[White]}Battery Runtime          ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_RUNTIME}'Mins${idsCL[Default]}"
 		[ ${REPORT} -eq 0 ] && echo
+		
+		DIVIDER . lightCyan ${PRI_WIDTH}
+		[ "${avgdays}" != "" ] && echo -e "							  ${idsCL[LightYellow]}${avgdays_disp}-Averages"
+		echo -en "${idsCL[LightCyan]}Totals                   : Amps        Watts"
+		[ "${avgdays}" != "" ] && echo -e "		Amps        Watts" || echo
+		AD=$(IDS_NUMBER_FORMAT ${OFFSITE_AMPS} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+		echo -en "${idsCL[White]}Offsite Server Room      ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_WATTS} 0`'W"
+		if [ "${avgdays}" != "" ]; then
+			echo -en "${idsCL[Yellow]}	Calculating Offsite Server Room Total Averages  ... "
+			OFFSITE_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['offsite-ups']} ${avgdays} both)
+			OFFSITE_AMP_avg=$(echo ${OFFSITE_avg} | cut -d'~' -f 1)
+			OFFSITE_WATT_avg=$(echo ${OFFSITE_avg} | cut -d'~' -f 2)
+			echo -en "\r\033[K"
+			echo -en "${idsCL[White]}Server Room w/AIR        ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W"
+			
+			AD=$(IDS_NUMBER_FORMAT ${OFFSITE_AMP_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+			echo -e "${idsCL[LightYellow]}		${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_WATT_avg} 0`'W"
+		else
+			echo
+		fi		
 				
-		echo -en "${idsCL[White]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_AMPS}`'amps ${idsCL[Default]}~ est${idsCL[Green]}${idsCL[Default]}"
+		echo -en "${idsCL[White]}Total Amps               ${idsCL[Default]}: ${idsCL[Green]}${AD}'amps ${idsCL[Default]}~ est${idsCL[Green]}${idsCL[Default]}"
 		[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${OFFSITE_AMP_avg}`'amps" || echo -e "${idsCL[Default]}"
 		echo -en "${idsCL[White]}Total Wattage            ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_WATTS} 0`'watts ${idsCL[Default]}~ est"
 		[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${OFFSITE_WATT_avg} 0`'watts" || echo -e "${idsCL[Default]}\n"