From 1a9a614ce4d64a62c8cbb546815bc97437385c23 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 9 Mar 2024 23:41:23 -0600
Subject: [PATCH] Update power.inc.sh

---
 inc/power.inc.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 1e82e1e7..57b7ed48 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -326,7 +326,6 @@ CHECKPOWER(){
 			declare -A OFFSITE_MISC
 			for mSENSOR in "${PW_POWERSENSOR_MISC[@]}"; do
 				OFFSITE_MISC[${mSENSOR}]=$(GET_TUYA_POWER ${mSENSOR})
-				echo "HERE: ${mSENSOR} = $(GET_TUYA_POWER ${mSENSOR})"
 			done
 			
 		fi
@@ -346,11 +345,15 @@ CHECKPOWER(){
 		echo -en "${idsCL[LightCyan]}Misc Sensors               Amps        Watts"
 		[ "${avgdays}" != "" ] && echo -e "		Amps        Watts" || echo -e "       Volts"
 		
+		TOTAL_MISC_WATTS=0; TOTAL_MISC_AMPS=0
 		for mSENSOR in "${!OFFSITE_MISC[@]}"; do
 			IFS=: read -r AMP WATT VOLT <<< ${OFFSITE_MISC[${mSENSOR}]}; unset IFS
 			AD1="${PW_MISCSENSOR_DESC[${mSENSOR}]}"; c=0; spc1=''; spca=`expr 25 - ${#AD1}`; until [ ${c} = ${spca} ]; do spc1="${spc1} "; ((c++)); done
 			AD2=$(IDS_NUMBER_FORMAT ${AMP} 2 yes); c=0; spc2=''; spca=`expr ${wspc} - ${#AD2}`; until [ ${c} = ${spca} ]; do spc2="${spc2} "; ((c++)); done
 			AD3=$(IDS_NUMBER_FORMAT ${WATT} 2 yes)
+			TOTAL_MISC_WATTS-$(expr ${TOTAL_MISC_WATTS} + ${WATT})
+			TOTAL_MISC_AMPS-$(expr ${TOTAL_MISC_AMPS} + ${AMP})
+			
 			echo -en "${idsCL[Default]}${AD1}${spc1}: ${idsCL[Green]}${AD2}'A${spc2}${AD3}'W"
 			if [ "${avgdays}" == "" ]; then
 				c=0; spc3=''; spca=`expr ${wspc} - ${#AD3}`; until [ ${c} = ${spca} ]; do spc3="${spc3} "; ((c++)); done
@@ -372,15 +375,17 @@ CHECKPOWER(){
 		[ "${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 Equipment        ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_WATTS} 0`'W"
+		[ ${OFFSITE_AMPS} -ne 0 ] && AD=${OFFSITE_AMPS} || AD=${TOTAL_MISC_AMPS}
+		[ ${OFFSITE_WATTS} -ne 0 ] && AW=${OFFSITE_WATTS} || AW=${TOTAL_MISC_WATTS}
+		AD=$(IDS_NUMBER_FORMAT ${AD} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+		echo -en "${idsCL[White]}Offsite Equipment        ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AW} 0`'W"
 		if [ "${avgdays}" != "" ]; then
-			echo -en "${idsCL[Yellow]}	Calculating Offsite Server Room Total Averages ... "
+			echo -en "${idsCL[Yellow]}	Calculating Offsite Equipment 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]}Offsite Server Room      ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_WATTS} 0`'W"
+			echo -en "${idsCL[White]}Offsite Equipment        ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_WATTS} 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"