From b69917aaaae1b371fade82dce3e7ac31d5260b0b Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 28 Jan 2024 16:38:07 -0600 Subject: [PATCH] Update temp.inc.sh --- inc/temp.inc.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 8af62dde..6718792d 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -235,7 +235,7 @@ CHECKTEMPSENSOR(){ fi fi fi - echo 1 + if [ "${temp_c}" != "null" ] && [ "${temp_c}" != "" ]; then if [ "${1}" == "ServerRoomTH" ]; then temp_f=`echo "scale=2; ${temp_c}*1.8+32+${PW_ServerRoomTH_Dev}" | bc` @@ -249,12 +249,11 @@ CHECKTEMPSENSOR(){ fi (( $(bc <<<"${temp_f} < 1") )) && [[ "${temp_f}" = *"."* ]] && temp_f="0${temp_f}" fi - echo 2 # echo "HERE: '${temp_c}' -> '${temp_f}'" # echo -en "" c=0; spct=''; [ "${PW_SENSOR_TYPE[${1}]}" == "system" ] && [[ "${1}" = *"FAN"* ]] && spc1=`expr 5 - ${#temp_f}` || spc1=`expr 6 - ${#temp_f}` until [ ${c} = ${spc1} ]; do spct="${spct} "; c=`expr ${c} + 1`; done - echo 3 + if [ "${average}" != "" ]; then ([ "${PW_SENSOR_TYPE[${1}]}" == "system" ] && [[ "${1}" = *"FAN"* ]]) && average_disp=$(IDS_NUMBER_FORMAT ${average}) || average_disp=${average} c=0; spca=''; spc1=`expr 6 - ${#average_disp}`; until [ ${c} = ${spc1} ]; do spca="${spca} "; c=`expr ${c} + 1`; done @@ -321,7 +320,7 @@ AVERAGETEMP(){ fi [ $(bc -l <<< "${daysback} < 1") -eq 1 ] && interval="$(ROUND $(bc <<< "scale=2; ${daysback}*24*60")) HOUR" || interval="${daysback} MINUTE" while IFS=$'\t' read date temp hum speed ;do - if [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${sensor}]}"* ]]; then + if [ "${3}" == "FanSpeed" ] && [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${sensor}]}"* ]]; then temptotal=$(bc <<< "scale=2; ${temptotal}+${speed}") elif [ "${sensorid}" == "19" ]; then temptotal=$(bc <<< "scale=0; ${temptotal}+${speed}")