From d9174454e438c97b4d4eeb06e305b004f288c515 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 10 Apr 2024 11:39:57 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- inc/temp.inc.sh | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/defaults.inc b/defaults.inc index a90e2fc0..fbca1440 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.6.77-04102024' +VERS='2.6.85-04102024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index e52dd543..c97a436b 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -960,19 +960,19 @@ Previous Temp: ${last_temp}${GAUGESH}" fi #### LOGGING OF SERVERROOM SENSOR DIFFERENCE - if [ "${SENSOR}" == "ServerRoomLA-Probe" ]; then + 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}/.serverroomth ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.serverroomth)) -lt 30 ]; 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}/.serverroomth)-${temp_f}") + 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}/.serverroomth) = ${temp_difference}" - rm -f ${PW_TMPFOLDER}/.serverroomth + # 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}" == "ServerRoomTH" ]; then - echo ${temp_f} >| ${PW_TMPFOLDER}/.serverroomth + elif [ "${SENSOR}" == "ServerRoomTemp" ]; then + echo ${temp_f} >| ${PW_TMPFOLDER}/.serverroomtemp fi ###################