From fde1e7fadcf8b9fc410afd9c3dc00bf2019c6eb8 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Thu, 9 May 2024 23:02:06 -0500
Subject: [PATCH] Update temp.inc.sh

---
 inc/temp.inc.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index f327197b..7f33cf8d 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -221,7 +221,11 @@ CHECKTEMP(){
 					DIVIDER . white ${PRI_WIDTH}
 					for M in 15 30 60 120; do
 						lico=" "
-						OLD_temp_f=($(${mysql_conn} -e "SELECT temp FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND date >= DATE_SUB(NOW(), INTERVAL ${M} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${M} - 7) MINUTE) ORDER BY date ASC LIMIT 1"))
+						if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]]; then
+							OLD_temp_f=($(${mysql_conn} -e "SELECT speed FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND date >= DATE_SUB(NOW(), INTERVAL ${M} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${M} - 7) MINUTE) ORDER BY date ASC LIMIT 1"))
+						else
+							OLD_temp_f=($(${mysql_conn} -e "SELECT temp FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND date >= DATE_SUB(NOW(), INTERVAL ${M} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${M} - 7) MINUTE) ORDER BY date ASC LIMIT 1"))
+						fi
 						OLD_temp_f=${OLD_temp_f[1]}
 						if [ "${OLD_temp_f}" != "" ]; then
 							if [ $(bc -l <<< "${temp_f} <  $(echo "scale=2; ${OLD_temp_f}+${PW_TEMPIND_DIFF}" | bc)") -eq 1 ] && [ $(bc -l <<< "$(echo "scale=2; ${OLD_temp_f}-${PW_TEMPIND_DIFF}" | bc) < ${temp_f}") -eq 1 ]; then