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
2024-04-29 09:39:11 -05:00
parent 1776ca33cf
commit 8e36e689a3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
inc/temp.inc.sh
View File

@@ -84,18 +84,19 @@ CHECKTEMP(){
DIVIDER . yellow ${PRI_WIDTH}
if [ "${avgdays}" = "noavg" ]; then
sensorsqry=''
sensorsqry=''; sq=0
for SENSOR in ${PW_SENSOR_ORD[@]}; do
if [[ "${SENSOR}" != *"FAN"* ]]; then
if [ "${PW_SENSOR_TYPE[${SENSOR}]}" != "esxi" ] && ([ "${search}" == "" ] || [[ "${SENSOR,,}" = *"${search,,}"* ]] || [[ "${PW_DESC_TEMP[${SENSOR}],,}" = *"${search,,}"* ]]) && ([ "${STYPE}" = "" ] || ([ "${STYPE}" = "mainsite" ] && ([ "${PW_REMOTE_SENSORS[${SENSOR}]}" = "" ] || [ "${PW_REMOTE_SENSORS[${SENSOR}]}" = "127.0.0.1" ] || [[ "${PW_REMOTE_SENSORS[${SENSOR}]}" = *"10.10."* ]])) || ([ "${STYPE}" = "offsite" ] && [ "${PW_REMOTE_SENSORS[${SENSOR}]}" != "" ] && [[ "${PW_REMOTE_SENSORS[${SENSOR}]}" = *"10.2.1."* ]])) && ([ "${TTYPE}" != "fans" ] || ([ "${TTYPE}" == "fans" ] && [[ "${SENSOR}" = *"Room"* ]])); then
[ "${sensorsqry}" != "" ] && sensorsqry="${sensorsqry},${PW_SENSOR_ID[${SENSOR}]}" || sensorsqry=${PW_SENSOR_ID[${SENSOR}]}
((sq++))
fi
fi
done
if [ "${sensorsqry}" != "" ]; then
declare -A RANGE_TEMPS
for R in ${PW_TEMPIND_RANGE[@]}; do
lookup=($(${mysql_conn} -e "SELECT sensorid,temp FROM servermonitor.sensor_data WHERE sensorid IN (${sensorqry}) AND date >= DATE_SUB(NOW(), INTERVAL ${R} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${R} - 7) MINUTE) ORDER BY date ASC LIMIT 1"))
lookup=($(${mysql_conn} -e "SELECT sensorid,temp FROM servermonitor.sensor_data WHERE sensorid IN (${sensorqry}) AND date >= DATE_SUB(NOW(), INTERVAL ${R} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${R} - 7) MINUTE) ORDER BY date ASC LIMIT ${sq}"))
RANGE_TEMPS["${R}-${lookup[2]}"]=${lookup[3]}
RANGE_TEMPS["${R}-${lookup[4]}"]=${lookup[5]}
done