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-03-16 08:35:43 -05:00
parent 0e27796a3a
commit 67fcf2037b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
inc/temp.inc.sh
View File

@@ -889,7 +889,6 @@ Previous Temp: ${last_temp}${GAUGESH}"
if [ "${PW_SENSOR_ID[${SENSORa}]}" != "" ] && [ ${lastinsert} -ge ${wait} ]; then if [ "${PW_SENSOR_ID[${SENSORa}]}" != "" ] && [ ${lastinsert} -ge ${wait} ]; then
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ]; then if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ]; then
rm -f ${PW_TMPFOLDER}/${SENSOR}*
entityid=($(${mysql_conn} -e "SELECT id FROM servermonitor.entities WHERE BINARY name='${vSENSOR// /_}' AND sensorid='${PW_SENSOR_ID[${SENSORa}]}'")) entityid=($(${mysql_conn} -e "SELECT id FROM servermonitor.entities WHERE BINARY name='${vSENSOR// /_}' AND sensorid='${PW_SENSOR_ID[${SENSORa}]}'"))
if [ "${entityid[1]}" == "" ]; then if [ "${entityid[1]}" == "" ]; then
${mysql_conn} -e "USE servermonitor; INSERT INTO entities (\`sensorid\`, \`name\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${vSENSOR// /_}')" ${mysql_conn} -e "USE servermonitor; INSERT INTO entities (\`sensorid\`, \`name\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${vSENSOR// /_}')"
@@ -909,13 +908,10 @@ Previous Temp: ${last_temp}${GAUGESH}"
${mysql_conn} -e "USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`entity\`, \`date\`, \`speed\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${entityid}','$(date +'%Y-%m-%d %H:%M:%S')','${FanSpeed}')" ${mysql_conn} -e "USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`entity\`, \`date\`, \`speed\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','${entityid}','$(date +'%Y-%m-%d %H:%M:%S')','${FanSpeed}')"
fi fi
elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "system" ] && [[ "${SENSORa}" = *"FAN"* ]]; then elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "system" ] && [[ "${SENSORa}" = *"FAN"* ]]; then
rm -f ${PW_TMPFOLDER}/${SENSOR}*
${mysql_conn} -e "USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`speed\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','$(date +'%Y-%m-%d %H:%M:%S')','${temp_f}')" ${mysql_conn} -e "USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`speed\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','$(date +'%Y-%m-%d %H:%M:%S')','${temp_f}')"
elif [ "${temp_h}" != "" ] && [ "${temp_h}" != "0" ]; then elif [ "${temp_h}" != "" ] && [ "${temp_h}" != "0" ]; then
rm -f ${PW_TMPFOLDER}/${SENSOR}*
QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`, \`hum\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','$(date +'%Y-%m-%d %H:%M:%S')','${temp_f}','${temp_h}')" QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`, \`hum\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','$(date +'%Y-%m-%d %H:%M:%S')','${temp_f}','${temp_h}')"
elif [ "${temp_f}" != "32.00" ]; then elif [ "${temp_f}" != "32.00" ]; then
rm -f ${PW_TMPFOLDER}/${SENSOR}*
QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','$(date +'%Y-%m-%d %H:%M:%S')','${temp_f}')" QRY="USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID[${SENSORa}]}','$(date +'%Y-%m-%d %H:%M:%S')','${temp_f}')"
elif [ "${SENSOR}" == "Powerwall-Switch" ]; then elif [ "${SENSOR}" == "Powerwall-Switch" ]; then
@@ -927,12 +923,16 @@ Previous Temp: ${last_temp}${GAUGESH}"
SENDNOTICE "${SENSOR} Sensor ERROR" "ERROR reading sensor data" 1 SENDNOTICE "${SENSOR} Sensor ERROR" "ERROR reading sensor data" 1
echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${SENSOR} Sensor - ERROR reading sensor data" >> ${logtemp} echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${SENSOR} Sensor - ERROR reading sensor data" >> ${logtemp}
fi fi
QRY=''
fi
if [ "${QRY}" != "" ]; then
${mysql_conn} -e "${QRY}"
rm -f ${PW_TMPFOLDER}/${SENSOR}*
echo "${temp_f}" >| ${PW_TMPFOLDER}/.lastinsert/${SENSOR}
fi fi
${mysql_conn} -e "${QRY}"
# if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "lacrosse" ]; then # if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "lacrosse" ]; then
# ${mysql_conn} -e "USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID["${SENSORa}-Probe"]}','$(date +'%Y-%m-%d %H:%M:%S')','${temp_probe_f}')" # ${mysql_conn} -e "USE servermonitor; INSERT INTO sensor_data (\`sensorid\`, \`date\`, \`temp\`) VALUES ('${PW_SENSOR_ID["${SENSORa}-Probe"]}','$(date +'%Y-%m-%d %H:%M:%S')','${temp_probe_f}')"
# fi # fi
echo "${temp_f}" >| ${PW_TMPFOLDER}/.lastinsert/${SENSOR}
fi fi
#### LOGGING OF SERVERROOM SENSOR DIFFERENCE #### LOGGING OF SERVERROOM SENSOR DIFFERENCE