From 9ec6ea2bee24d9fa51ca38e5d6f515072148ec25 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 19 Jul 2025 09:38:13 -0500
Subject: [PATCH] Update power.inc.sh

---
 inc/power.inc.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 98943371..11d63397 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -536,7 +536,7 @@ CHECKPOWER(){
 					echo -en "${idsCL[Default]}${AD1}${spc1}: ${idsCL[Green]}${AD2}'A${spc2}${AD3}'W"
 			
 					AD=$(IDS_NUMBER_FORMAT ${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 ${WATT_avg} 1 yes`'W"
+					echo -e "${idsCL[LightYellow]}		${AD}'A${spc}`IDS_NUMBER_FORMAT ${WATT_avg} 2 yes`'W"
 				fi
 			fi
 		done
@@ -546,24 +546,24 @@ CHECKPOWER(){
 		echo -en "${idsCL[LightCyan]}Totals                     Amps        Watts"
 		[ "${avgdays}" != "" ] && echo -e "		Amps        Watts" || echo -e "       Volts"
 		if (( $(bc <<<"${OFFSITE_WATTS} < ${TOTAL_MISC_WATTS}") )); then
-			AW=${TOTAL_MISC_WATTS}
+			AW=$(IDS_NUMBER_FORMAT ${TOTAL_MISC_WATTS} 2 yes)
 			AD=${TOTAL_MISC_AMPS}
 		else
-			AW=${OFFSITE_WATTS}
+			AW=$(IDS_NUMBER_FORMAT ${OFFSITE_WATTS} 2 yes)
 			AD=${OFFSITE_AMPS}
 		fi
 		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} 1 yes`'W"
+		echo -en "${idsCL[White]}Offsite Equipment        ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}{AW}'W"
 		if [ "${avgdays}" != "" ]; then
 			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 Equipment        ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AW} 1 yes`'W"
+			echo -en "${idsCL[White]}Offsite Equipment        ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}${AW}'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} 1 yes`'W"
+			echo -e "${idsCL[LightYellow]}		${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_WATT_avg} 2 yes`'W"
 		else
 			c=0; spc3=''; spca=`expr ${wspc} - ${#AW}`; until [ ${c} = ${spca} ]; do spc3="${spc3} "; ((c++)); done
 			echo -e "${spc3}${OFFSITE_VOLTS}'V${idsCL[Default]}"