voltron/powerwall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update temp.inc.sh

Browse Source
This commit is contained in:
David Schroeder
2023-12-27 09:29:16 -06:00
parent e8df564e22
commit fc380a249e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
inc/temp.inc.sh
View File

@@ -12,7 +12,7 @@ CHECKTEMP(){
done done
echo echo
if [ "${avgdays}" != "" ]; then if [ "${avgdays}" != "" ]; then
[ ${avgdays} -lt 10 ] && avgdays_disp=" ${avgdays}" || avgdays_disp=${avgdays} [ $(bc -l <<< "${avgdays} < 10") -eq 1 ] && avgdays_disp=" ${avgdays}" || avgdays_disp=${avgdays}
echo -e "${idsCL[Cyan]}Sensor Temperature(s) Current / ${idsCL[LightYellow]}${avgdays_disp}DayAVG ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[LightRed]}critical${idsCL[Default]}" echo -e "${idsCL[Cyan]}Sensor Temperature(s) Current / ${idsCL[LightYellow]}${avgdays_disp}DayAVG ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[LightRed]}critical${idsCL[Default]}"
else else
avgdays=noavg avgdays=noavg
@@ -268,6 +268,12 @@ AVERAGETEMP(){
else else
WHERE="sensorid=${sensorid}" WHERE="sensorid=${sensorid}"
fi fi
if [ $(bc -l <<< "${daysback} < 1") -eq 1 ]; then
interval="$(ROUND $(bc <<< "scale=2; ${daysback}*24")) HOUR"
else
interval="${daysback} DAY"
fi
while IFS=$'\t' read date temp hum speed ;do while IFS=$'\t' read date temp hum speed ;do
if [ "${sensorid}" == "14" ] || [ "${sensorid}" == "19" ]; then if [ "${sensorid}" == "14" ] || [ "${sensorid}" == "19" ]; then
@@ -276,7 +282,7 @@ AVERAGETEMP(){
temptotal=$(bc <<< "scale=2; ${temptotal}+${temp}") temptotal=$(bc <<< "scale=2; ${temptotal}+${temp}")
fi fi
((logsfound++)) ((logsfound++))
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;") done < <(${mysql_conn} -se "USE servermonitor; SELECT date,temp,hum,speed from sensor_data WHERE ${WHERE} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${interval}) AND NOW() ORDER BY id DESC;")
if [ "${sensorid}" == "14" ] || [ "${sensorid}" == "19" ]; then if [ "${sensorid}" == "14" ] || [ "${sensorid}" == "19" ]; then
# average=$(bc <<< "scale=0; ${temptotal}/${logsfound}") # average=$(bc <<< "scale=0; ${temptotal}/${logsfound}")
average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}")) average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}"))