diff --git a/defaults.inc b/defaults.inc index bac415f2..d5aee744 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.6.99-04212024' +VERS='2.7.1-04212024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index a195b034..d36e7aa7 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -127,7 +127,7 @@ CHECKTEMP(){ until [ ${c} = ${spc1} ]; do spct="${spct} "; c=`expr ${c} + 1`; done reading="${lclr}${lmd}${spct}${temp_f_disp}${GAUGESH}" - if [ "${average}" = "" ] && [ -f ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old ]; then + if [ "${average}" = "" ] && [[ "${SENSOR}" != *"FAN"* ]] && [ -f ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old ]; then if [ $(bc -l <<< "${temp_f} <= $(echo "scale=2; $(cat ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old | cut -d'~' -f 1)+1.5" | bc)") -eq 1 ] && [ $(bc -l <<< "${temp_f} >= $(echo "scale=2; $(cat ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old | cut -d'~' -f 1)-1.5" | bc)") -eq 1 ]; then reading="${reading} ${idsCL[LightCyan]}\u23F9 " elif [ $(bc -l <<< "$(cat ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old | cut -d'~' -f 1) < ${temp_f}") -eq 1 ]; then @@ -1001,13 +1001,15 @@ Previous Temp: ${last_temp}${GAUGESH}" if [ "${QRY}" != "" ]; then ${mysql_conn} -e "${QRY}" echo "${temp_f}" >| ${PW_TMPFOLDER}/.lastinsert/${SENSOR} - if [ ! -f ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre ]; then - echo "${temp_f}" > ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre + if [[ "${SENSOR}" != *"FAN"* ]]; then + if [ ! -f ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre ]; then + echo "${temp_f}" > ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre - elif ([ ! -f ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre)) -ge 600 ]) || ([ -f ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old)) -ge 600 ]); then - mv ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old 2> /dev/null - echo "${temp_f}" > ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre + elif ([ ! -f ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre)) -ge 600 ]) || ([ -f ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old ] && [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old)) -ge 600 ]); then + mv ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.old 2> /dev/null + echo "${temp_f}" > ${PW_TMPFOLDER}/.lastinsert/${SENSOR}.pre + fi fi