From a79b063aff4a443f219d0dd338af24900cccb67c Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 15 Apr 2024 11:37:55 -0500 Subject: [PATCH] Update temp.inc.sh --- inc/temp.inc.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index a66e60a7..61dd8ed8 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -960,20 +960,20 @@ Previous Temp: ${last_temp}${GAUGESH}" fi #### LOGGING OF SERVERROOM SENSOR DIFFERENCE - # if [ "${SENSOR}" == "ServerRoom-Rear" ]; then - # if [ ! -f ${PW_TMPFOLDER}/.log.sr.difference ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.log.sr.difference)) -ge 300 ]; then - # if [ "${temp_f}" != "" ] && (( $(bc <<< "${temp_f} >= 2") )) && [ -f ${PW_TMPFOLDER}/.serverroomtemp ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.serverroomtemp)) -lt 30 ]; then - # [ ! -f ${PW_TMPFOLDER}/.log.sr.difference ] && touch ${PW_TMPFOLDER}/.log.sr.difference - # temp_difference=$(bc <<< "scale=2; $(cat ${PW_TMPFOLDER}/.serverroomtemp)-${temp_f}") - # # (( $(bc <<<"${temp_difference} < 0") )) && temp_difference=`echo "scale=2; ${temp_difference} * -1" | bc` - # echo "$(date "+%Y-%m-%d %H:%M:%S")~${temp_difference}" >> ${PW_TMPFOLDER}/.log.sr.difference - # # echo "[$(date +'%Y-%m-%d %H:%M:%S')] ${temp_f} - $(cat ${PW_TMPFOLDER}/.serverroomtemp) = ${temp_difference}" - # rm -f ${PW_TMPFOLDER}/.serverroomtemp - # fi - # fi - # elif [ "${SENSOR}" == "ServerRoomTemp" ]; then - # echo ${temp_f} >| ${PW_TMPFOLDER}/.serverroomtemp - # fi + if [ "${SENSOR}" == "ServerRoom-Rear" ]; then + if [ ! -f ${PW_TMPFOLDER}/.log.sr.difference ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.log.sr.difference)) -ge 300 ]; then + if [ "${temp_f}" != "" ] && (( $(bc <<< "${temp_f} >= 2") )) && [ -f ${PW_TMPFOLDER}/.serverroomtemp ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.serverroomtemp)) -lt 30 ]; then + [ ! -f ${PW_TMPFOLDER}/.log.sr.difference ] && touch ${PW_TMPFOLDER}/.log.sr.difference + temp_difference=$(bc <<< "scale=2; $(cat ${PW_TMPFOLDER}/.serverroomtemp)-${temp_f}") + # (( $(bc <<<"${temp_difference} < 0") )) && temp_difference=`echo "scale=2; ${temp_difference} * -1" | bc` + echo "$(date "+%Y-%m-%d %H:%M:%S")~${temp_difference}" >> ${PW_TMPFOLDER}/.log.sr.difference + # echo "[$(date +'%Y-%m-%d %H:%M:%S')] ${temp_f} - $(cat ${PW_TMPFOLDER}/.serverroomtemp) = ${temp_difference}" + rm -f ${PW_TMPFOLDER}/.serverroomtemp + fi + fi + elif [ "${SENSOR}" == "ServerRoomTemp" ]; then + echo ${temp_f} >| ${PW_TMPFOLDER}/.serverroomtemp + fi ################### else