From ecd2885e2a8fe796d8b668a082ababc36a8ef9f1 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Fri, 16 Feb 2024 22:36:10 -0600
Subject: [PATCH] update

---
 inc/power.inc.sh | 3 ++-
 inc/temp.inc.sh  | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 2fb9e1bd..be08f275 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -342,9 +342,10 @@ CHECKPOWER(){
 			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); if [ "${avgdays}" != "" ]; then {c=0; spc3=''; spca=`expr ${wspc} - ${#AD3}`; until [ ${c} = ${spca} ]; do spc3="${spc3} "; ((c++)); done; } done
+			AD3=$(IDS_NUMBER_FORMAT ${WATT} 2 yes)
 			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
 				echo -e "${spc3}${VOLT}'V${idsCL[Default]}"
 			else
 				echo -en "${idsCL[Yellow]}	Calculating ${avgdays_disp} Average ... "
diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 8b7fb6ad..44299ac0 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -667,14 +667,14 @@ CHECKTEMP_SERVICE_RUNSENSOR(){
 								
 							elif [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.set ]; then
 								NEW_FanSpeed=$(GET_DEFAULT_FANSPEED ${SENSORa} ${FanSpeed})
-								SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} FanSpeed Control" "GOLDILOCK: Defaulting FanSpeeds to ${NEW_FanSpeed}%"
+								# SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} FanSpeed Control" "GOLDILOCK: Defaulting FanSpeeds to ${NEW_FanSpeed}%"
 								SET_ESXI_FANSPEED ${NEW_FanSpeed} ${SENSORa} >/dev/null 2>&1 &
 							fi
 						### INCREASING ###
 						elif (( $(bc <<< "${temp_f} >= ${ESXI_DEFAULT_EXHAUST_MIN}") )); then
 							if [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.set ]; then
 								NEW_FanSpeed=$(expr $(GET_DEFAULT_FANSPEED ${SENSORa} ${FanSpeed}) + 5)
-								SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} FanSpeed Control" "INCREASE: Defaulting FanSpeeds to ${NEW_FanSpeed}%"
+								# SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} FanSpeed Control" "INCREASE: Defaulting FanSpeeds to ${NEW_FanSpeed}%"
 								SET_ESXI_FANSPEED ${NEW_FanSpeed} ${SENSORa} >/dev/null 2>&1 &
 							else
 								(( $(bc <<< "${temp_f} >= $(expr ${ESXI_DEFAULT_EXHAUST_MIN} + 5)") )) && FAN_INCREASE=10 || FAN_INCREASE=5
@@ -689,7 +689,7 @@ CHECKTEMP_SERVICE_RUNSENSOR(){
 						else
 							if [ ! -f ${PW_TMPFOLDER}/.lastfancheck/${SENSORa}.set ]; then
 								NEW_FanSpeed=$(expr $(GET_DEFAULT_FANSPEED ${SENSORa} ${FanSpeed}) - 5)
-								SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} FanSpeed Control" "DECREASE: Defaulting FanSpeeds to ${NEW_FanSpeed}%"
+								# SENDNOTICE "${PW_HOST_IDRACS[${SENSORa}]} FanSpeed Control" "DECREASE: Defaulting FanSpeeds to ${NEW_FanSpeed}%"
 								SET_ESXI_FANSPEED ${NEW_FanSpeed} ${SENSORa} >/dev/null 2>&1 &
 							else
 								(( $(bc <<< "${temp_f} <= $(expr ${ESXI_DEFAULT_EXHAUST_MIN} - 5)") )) && FAN_DECREASE=10 || FAN_DECREASE=5