From 51be85721f8c19a398d32c9791f0e93645aec3a5 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Mon, 29 Apr 2024 08:38:22 -0500 Subject: [PATCH] Update temp.inc.sh --- inc/temp.inc.sh | 77 +++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 8406c517..ba8d7e4e 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -130,6 +130,7 @@ CHECKTEMP(){ if [ "${avgdays}" = "noavg" ] && [[ "${SENSOR}" != *"FAN"* ]]; then for R in ${PW_TEMPIND_RANGE[@]}; do + echo "H: ${R} - $(expr ${R} - 7)" OLD_temp_f=($(${mysql_conn} -e "SELECT temp FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND date >= DATE_SUB(NOW(), INTERVAL ${R} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${R} - 7) MINUTE) ORDER BY date ASC LIMIT 1")) if [ $(bc -l <<< "${temp_f} < $(echo "scale=2; ${OLD_temp_f[1]}+${PW_TEMPIND_DIFF}" | bc)") -eq 1 ] && [ $(bc -l <<< "$(echo "scale=2; ${OLD_temp_f[1]}-${PW_TEMPIND_DIFF}" | bc) < ${temp_f}") -eq 1 ]; then echo -en "${idsCL[White]}\u23F9 " @@ -152,43 +153,43 @@ CHECKTEMP(){ - OLD1_temp_f=($(${mysql_conn} -e "SELECT temp FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND date >= DATE_SUB(NOW(), INTERVAL 30 MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL 20 MINUTE) ORDER BY date ASC LIMIT 1")); OLD1_temp_f=${OLD1_temp_f[1]} - OLD2_temp_f=($(${mysql_conn} -e "SELECT temp FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND date >= DATE_SUB(NOW(), INTERVAL 60 MINUTE) AND date >= DATE_SUB(NOW(), INTERVAL 50 MINUTE) ORDER BY date ASC LIMIT 1")); OLD2_temp_f=${OLD2_temp_f[1]} - - if [ "${avgdays}" = "noavg" ] && [[ "${SENSOR}" != *"FAN"* ]] && [ "${OLD1_temp_f}" != "" ]; then - if [ $(bc -l <<< "${temp_f} < $(echo "scale=2; ${OLD1_temp_f}+${PW_TEMPIND_DIFF}" | bc)") -eq 1 ] && [ $(bc -l <<< "$(echo "scale=2; ${OLD1_temp_f}-${PW_TEMPIND_DIFF}" | bc) < ${temp_f}") -eq 1 ]; then - echo -en " ${idsCL[White]}\u23F9 " - elif [ $(bc -l <<< "$(bc <<< "scale=2; ${OLD1_temp_f}+(${PW_TEMPIND_DIFF}*2)") < ${temp_f}") -eq 1 ]; then - echo -en " ${idsCL[LightRed]}\u25B2 " - elif [ $(bc -l <<< "${OLD1_temp_f} < ${temp_f}") -eq 1 ]; then - echo -en " ${idsCL[Magenta]}\u25B2 " - elif [ $(bc -l <<< "${temp_f} < $(bc <<< "scale=2; ${OLD1_temp_f}-(${PW_TEMPIND_DIFF}*2)")") -eq 1 ]; then - echo -en " ${idsCL[LightGreen]}\u25BC " - elif [ $(bc -l <<< "${temp_f} < ${OLD1_temp_f}") -eq 1 ]; then - echo -en " ${idsCL[LightCyan]}\u25BC " - else - echo -en " " - fi - if [ "${OLD2_temp_f}" != "" ]; then - if [ $(bc -l <<< "${temp_f} < $(echo "scale=2; ${OLD2_temp_f}+${PW_TEMPIND_DIFF}" | bc)") -eq 1 ] && [ $(bc -l <<< "$(echo "scale=2; ${OLD2_temp_f}-${PW_TEMPIND_DIFF}" | bc) < ${temp_f}") -eq 1 ]; then - echo -en "${idsCL[White]}\u23F9 " - elif [ $(bc -l <<< "$(bc <<< "scale=2; ${OLD2_temp_f}+(${PW_TEMPIND_DIFF}*2)") < ${temp_f}") -eq 1 ]; then - echo -en "${idsCL[LightRed]}\u25B2 " - elif [ $(bc -l <<< "${OLD2_temp_f} < ${temp_f}") -eq 1 ]; then - echo -en "${idsCL[Magenta]}\u25B2 " - elif [ $(bc -l <<< "${temp_f} < $(bc <<< "scale=2; ${OLD2_temp_f}-(${PW_TEMPIND_DIFF}*2)")") -eq 1 ]; then - echo -en "${idsCL[LightGreen]}\u25BC " - elif [ $(bc -l <<< "${temp_f} < ${OLD2_temp_f}") -eq 1 ]; then - echo -en "${idsCL[LightCyan]}\u25BC " - else - echo -en " " - fi - else - echo -en " " - fi - elif [ "${avgdays}" = "noavg" ]; then - echo -en " " - fi + # OLD1_temp_f=($(${mysql_conn} -e "SELECT temp FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND date >= DATE_SUB(NOW(), INTERVAL 30 MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL 20 MINUTE) ORDER BY date ASC LIMIT 1")); OLD1_temp_f=${OLD1_temp_f[1]} + # OLD2_temp_f=($(${mysql_conn} -e "SELECT temp FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND date >= DATE_SUB(NOW(), INTERVAL 60 MINUTE) AND date >= DATE_SUB(NOW(), INTERVAL 50 MINUTE) ORDER BY date ASC LIMIT 1")); OLD2_temp_f=${OLD2_temp_f[1]} + # + # if [ "${avgdays}" = "noavg" ] && [[ "${SENSOR}" != *"FAN"* ]] && [ "${OLD1_temp_f}" != "" ]; then + # if [ $(bc -l <<< "${temp_f} < $(echo "scale=2; ${OLD1_temp_f}+${PW_TEMPIND_DIFF}" | bc)") -eq 1 ] && [ $(bc -l <<< "$(echo "scale=2; ${OLD1_temp_f}-${PW_TEMPIND_DIFF}" | bc) < ${temp_f}") -eq 1 ]; then + # echo -en " ${idsCL[White]}\u23F9 " + # elif [ $(bc -l <<< "$(bc <<< "scale=2; ${OLD1_temp_f}+(${PW_TEMPIND_DIFF}*2)") < ${temp_f}") -eq 1 ]; then + # echo -en " ${idsCL[LightRed]}\u25B2 " + # elif [ $(bc -l <<< "${OLD1_temp_f} < ${temp_f}") -eq 1 ]; then + # echo -en " ${idsCL[Magenta]}\u25B2 " + # elif [ $(bc -l <<< "${temp_f} < $(bc <<< "scale=2; ${OLD1_temp_f}-(${PW_TEMPIND_DIFF}*2)")") -eq 1 ]; then + # echo -en " ${idsCL[LightGreen]}\u25BC " + # elif [ $(bc -l <<< "${temp_f} < ${OLD1_temp_f}") -eq 1 ]; then + # echo -en " ${idsCL[LightCyan]}\u25BC " + # else + # echo -en " " + # fi + # if [ "${OLD2_temp_f}" != "" ]; then + # if [ $(bc -l <<< "${temp_f} < $(echo "scale=2; ${OLD2_temp_f}+${PW_TEMPIND_DIFF}" | bc)") -eq 1 ] && [ $(bc -l <<< "$(echo "scale=2; ${OLD2_temp_f}-${PW_TEMPIND_DIFF}" | bc) < ${temp_f}") -eq 1 ]; then + # echo -en "${idsCL[White]}\u23F9 " + # elif [ $(bc -l <<< "$(bc <<< "scale=2; ${OLD2_temp_f}+(${PW_TEMPIND_DIFF}*2)") < ${temp_f}") -eq 1 ]; then + # echo -en "${idsCL[LightRed]}\u25B2 " + # elif [ $(bc -l <<< "${OLD2_temp_f} < ${temp_f}") -eq 1 ]; then + # echo -en "${idsCL[Magenta]}\u25B2 " + # elif [ $(bc -l <<< "${temp_f} < $(bc <<< "scale=2; ${OLD2_temp_f}-(${PW_TEMPIND_DIFF}*2)")") -eq 1 ]; then + # echo -en "${idsCL[LightGreen]}\u25BC " + # elif [ $(bc -l <<< "${temp_f} < ${OLD2_temp_f}") -eq 1 ]; then + # echo -en "${idsCL[LightCyan]}\u25BC " + # else + # echo -en " " + # fi + # else + # echo -en " " + # fi + # elif [ "${avgdays}" = "noavg" ]; then + # echo -en " " + # fi else temp_f_disp=" " @@ -228,7 +229,7 @@ CHECKTEMP(){ fws=10 tmp="${spca}${average_disp}${GAUGESH}" else - fws=16 + fws=$(expr 21 - ${#PW_TEMPIND_RANGE[@]}) tmp="${spct}${temp_f_disp}${GAUGESH}" fi c=0; spc=''; spc1=`expr ${fws} - ${#tmp}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done