From d9971f58e72e8cce750214ae6a24d39aa903bf5d Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Fri, 20 Feb 2026 19:36:35 -0600
Subject: [PATCH] Update power.inc.sh

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

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 7f7918eb..57ca2610 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -178,6 +178,9 @@ CHECKPOWER(){
 					AIRCON_WATT=0
 				fi
         
+				SVRRM_AMP_WAC=$(echo "scale=2; ${SVRRM_AMP}+${AIRCON_AMP}" | tr -d $'\r' | bc -l)
+				SVRRM_WATT_WAC=$(echo "scale=2; ${SVRRM_WATT}+${AIRCON_WATT}" | tr -d $'\r' | bc -l)
+        
       fi
 			#
 			# if [ "$(CHECK_HOST ${PW_APCPDU_IP})" != "false" ]; then
@@ -266,24 +269,24 @@ CHECKPOWER(){
 					echo
 				fi
 						
-				AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-				MSG="${idsBG[Blue]}${idsCL[White]}Equipment Subtotal       ${idsCL[Default]}: ${idsCL[White]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 1 yes`'W ${idsBG[Default]}"
-				echo -en "${MSG}"
-				if [ "${avgdays}" != "" ]; then
-					echo -en "${idsCL[Yellow]}	Calculating Equipment Subtotal 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)
-					echo -en "\r\033[K"
-				
-					AS=$(IDS_NUMBER_FORMAT ${SVRRM_WATT} 1 yes); c=0; spcA=''; spc1=`expr ${wspc} - ${#AS} + 4`; until [ ${c} = ${spc1} ]; do spcA="${spcA} "; ((c++)); done
-					AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP_avg} 2 yes); c=0; spcB=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spcB="${spcB} "; ((c++)); done
-					echo -e "${MSG}${idsBG[Blue]}${spcA}${idsCL[LightYellow]}${AD}'A${spcB}`IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 1 yes`'W ${idsBG[Default]}"
-				else
-					echo -e "${idsBG[Default]}"
-				fi
-			
-				DIVIDER . lightCyan ${PRI_WIDTH}
+        # AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+        # MSG="${idsBG[Blue]}${idsCL[White]}Equipment Subtotal       ${idsCL[Default]}: ${idsCL[White]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 1 yes`'W ${idsBG[Default]}"
+        # echo -en "${MSG}"
+        # if [ "${avgdays}" != "" ]; then
+        #   echo -en "${idsCL[Yellow]}  Calculating Equipment Subtotal 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)
+        #   echo -en "\r\033[K"
+        #
+        #   AS=$(IDS_NUMBER_FORMAT ${SVRRM_WATT} 1 yes); c=0; spcA=''; spc1=`expr ${wspc} - ${#AS} + 4`; until [ ${c} = ${spc1} ]; do spcA="${spcA} "; ((c++)); done
+        #   AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP_avg} 2 yes); c=0; spcB=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spcB="${spcB} "; ((c++)); done
+        #   echo -e "${MSG}${idsBG[Blue]}${spcA}${idsCL[LightYellow]}${AD}'A${spcB}`IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 1 yes`'W ${idsBG[Default]}"
+        # else
+        #   echo -e "${idsBG[Default]}"
+        # fi
+        #
+        # DIVIDER . lightCyan ${PRI_WIDTH}
 			
 				AD=$(IDS_NUMBER_FORMAT ${AIRCON_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
 				MSG="${idsCL[White]}Air Conditioner          ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AIRCON_WATT} 1 yes`'W"