diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 97764f6f..9b63abf6 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -253,10 +253,14 @@ AVERAGETEMP(){ WHERE="sensorid=${sensorid}" fi - while IFS=$'\t' read date temp hum ;do - temptotal=$(bc <<< "scale=1; ${temptotal}+${temp}") + while IFS=$'\t' read date temp hum speed ;do + if [ "${sensorid}" == "14" ] || [ "${sensorid}" == "19" ]; then + temptotal=$(bc <<< "scale=1; ${temptotal}+${speed}") + else + temptotal=$(bc <<< "scale=1; ${temptotal}+${temp}") + fi ((logsfound++)) - done < <(${mysql_conn} -se "USE servermonitor; SELECT date,temp,hum from sensor_data WHERE ${WHERE} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() ORDER BY id DESC;") + done < <(${mysql_conn} -se "USE servermonitor; SELECT date,temp,hum,speed from sensor_data WHERE ${WHERE} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() ORDER BY id DESC;") average=$(bc <<< "scale=1; ${temptotal}/${logsfound}") (( $(bc <<<"${average} < 1") )) && [[ "${average}" = *"."* ]] && average="0${average}" echo ${average}