diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 66ccc291..f298ca0f 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -285,8 +285,10 @@ CHECKTEMP(){ DIVIDER . lightCyan 50 for M in 15 30 60 120; do lico=" " - OLD_temp_h=($(${mysql_conn} -e "SELECT hum 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")) - OLD_temp_h=${OLD_temp_h[1]} + OLD_temp_h=($(${mysql_conn} -e "SELECT hum,date 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")) + OLD_temp_h=${OLD_temp_h[2]} + OLD_date=${OLD_temp_f[3]} + OLD_time=${OLD_temp_f[4]} if [ "${OLD_temp_h}" != "" ]; then if [ $(bc -l <<< "${temp_h} < $(echo "scale=2; ${OLD_temp_h}+${PW_TEMPIND_DIFF}" | bc)") -eq 1 ] && [ $(bc -l <<< "$(echo "scale=2; ${OLD_temp_h}-${PW_TEMPIND_DIFF}" | bc) < ${temp_h}") -eq 1 ]; then lclr="${idsCL[White]}" @@ -319,7 +321,7 @@ CHECKTEMP(){ echo -e "~${M}m ago - ${lclr}${lico}" fi done - + echo -e "${idsCL[Default]} -- ${OLD_date} @ ${OLD_time}" fi fi @@ -482,12 +484,14 @@ CHECKTEMP(){ entityid=($(${mysql_conn} -e "SELECT id FROM servermonitor.entities WHERE BINARY name='${sensorname// /_}' AND sensorid='${PW_SENSOR_ID[${SENSOR}]}'")) if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]]; then spc_cnt=6 - OLD_temp_f=($(${mysql_conn} -e "SELECT speed FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND entity=${entityid[1]} AND date >= DATE_SUB(NOW(), INTERVAL ${M} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${M} - 7) MINUTE) ORDER BY date ASC LIMIT 1")) + OLD_temp_f=($(${mysql_conn} -e "SELECT speed,date FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND entity=${entityid[1]} 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 spc_cnt=7 - OLD_temp_f=($(${mysql_conn} -e "SELECT temp FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND entity=${entityid[1]} AND date >= DATE_SUB(NOW(), INTERVAL ${M} MINUTE) AND date <= DATE_SUB(NOW(), INTERVAL $(expr ${M} - 7) MINUTE) ORDER BY date ASC LIMIT 1")) + OLD_temp_f=($(${mysql_conn} -e "SELECT temp,date FROM servermonitor.sensor_data WHERE sensorid='${PW_SENSOR_ID[${SENSOR}]}' AND entity=${entityid[1]} 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]} + OLD_temp_f=${OLD_temp_f[2]} + OLD_date=${OLD_temp_f[3]} + OLD_time=${OLD_temp_f[4]} 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 lclr="${idsCL[White]}" @@ -518,11 +522,12 @@ CHECKTEMP(){ c=0; spc=''; spc1=`expr ${spc_cnt} - ${#OLD_temp_f}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done echo -en "~${M}m ago - ${lclr}${lico}${spc}" - [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]] && echo -e "$(IDS_NUMBER_FORMAT ${OLD_temp_f})${GAUGESH}" || echo -e "${OLD_temp_f}${GAUGESH}" + [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]] && echo -en "$(IDS_NUMBER_FORMAT ${OLD_temp_f})${GAUGESH}" || echo -en "${OLD_temp_f}${GAUGESH}" else - echo -e "${lclr}~${M}m ago - ${lclr}${lico}" + echo -en "${lclr}~${M}m ago - ${lclr}${lico}" fi done + echo -e "${idsCL[Default]} -- ${OLD_date} @ ${OLD_time}" DIVIDER . white ${PRI_WIDTH} fi