Update temp.inc.sh
This commit is contained in:
@@ -253,10 +253,14 @@ AVERAGETEMP(){
|
|||||||
WHERE="sensorid=${sensorid}"
|
WHERE="sensorid=${sensorid}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
while IFS=$'\t' read date temp hum ;do
|
while IFS=$'\t' read date temp hum speed ;do
|
||||||
temptotal=$(bc <<< "scale=1; ${temptotal}+${temp}")
|
if [ "${sensorid}" == "14" ] || [ "${sensorid}" == "19" ]; then
|
||||||
|
temptotal=$(bc <<< "scale=1; ${temptotal}+${speed}")
|
||||||
|
else
|
||||||
|
temptotal=$(bc <<< "scale=1; ${temptotal}+${temp}")
|
||||||
|
fi
|
||||||
((logsfound++))
|
((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}")
|
average=$(bc <<< "scale=1; ${temptotal}/${logsfound}")
|
||||||
(( $(bc <<<"${average} < 1") )) && [[ "${average}" = *"."* ]] && average="0${average}"
|
(( $(bc <<<"${average} < 1") )) && [[ "${average}" = *"."* ]] && average="0${average}"
|
||||||
echo ${average}
|
echo ${average}
|
||||||
|
|||||||
Reference in New Issue
Block a user