diff --git a/defaults.inc b/defaults.inc index d3647abc..a9a73bd6 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.6.11-02112024' +VERS='2.6.20-02112024' noheader=' update service dailytemp confsync -r -report ' diff --git a/inc/power.inc.sh b/inc/power.inc.sh index f5b56a80..da5e8b90 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -318,7 +318,7 @@ CHECKPOWER(){ declare -A OFFSITE_MISC for mSENSOR in "${PW_POWERSENSOR_MISC[@]}"; do INFO=$(curl -m 3 -s http://${PW_TUYA_API}/status/${PW_SENSOR_DEVICEID[${mSENSOR}]} | jq '.dps') - if [ "$(echo "${INFO}" | grep '"18":' | cut -d' ' -f 4)" != "" ]; then + if [ "$(echo "${INFO}" | grep '"18":')" != "" ]; then AMP=$(echo "${INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g') AMP=$(ROUND_NUMBER $(echo "scale=3; ${AMP}/1000" | bc -l) 2) WATT=$(echo "${INFO}" | grep '"19":' | cut -d' ' -f 4 | sed 's/,//g') @@ -969,6 +969,31 @@ POWERLOGGER_SERVICE(){ ${mysql_conn} -e "USE servermonitor; ${QRY}" fi + + for mSENSOR in "${PW_POWERSENSOR_MISC[@]}"; do + INFO=$(curl -m 3 -s http://${PW_TUYA_API}/status/${PW_SENSOR_DEVICEID[${mSENSOR}]} | jq '.dps') + if [ "${INFO}" != "" ] && [ "${PW_POWERSENSOR_ID[${mSENSOR}]}" != "" ]; then + if [ "$(echo "${INFO}" | grep '"18":')" != "" ]; then + AMP=$(echo "${INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g') + AMP=$(ROUND_NUMBER $(echo "scale=3; ${AMP}/1000" | bc -l) 2) + WATT=$(echo "${INFO}" | grep '"19":' | cut -d' ' -f 4 | sed 's/,//g') + WATT=$(echo "scale=1; ${WATT}/10" | bc -l) + VOLT=$(echo "${INFO}" | grep '"20":' | cut -d' ' -f 4 | sed 's/,//g') + VOLT=$(echo "scale=1; ${VOLT}/10" | bc -l) + else + AMP=$(echo "${INFO}" | grep '"4":' | cut -d' ' -f 4 | sed 's/,//g') + AMP=$(ROUND_NUMBER $(echo "scale=3; ${AMP}/1000" | bc -l) 2) + WATT=$(echo "${INFO}" | grep '"5":' | cut -d' ' -f 4 | sed 's/,//g') + WATT=$(echo "scale=1; ${WATT}/10" | bc -l) + VOLT=$(echo "${INFO}" | grep '"6":' | cut -d' ' -f 4 | sed 's/,//g') + VOLT=$(echo "scale=1; ${VOLT}/10" | bc -l) + fi + QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID[${mSENSOR}]}','${LogDataTime}','${VOLT}','${AMP}','${WATT}')" + ${mysql_conn} -e "USE servermonitor; ${QRY}" + fi + done + + OFFSITE_FIREWALL_INFO=$(curl -m 3 -s http://${PW_TUYA_API}/status/${PW_SENSOR_DEVICEID['offsite-firewall']} | jq '.dps') if [ "${OFFSITE_FIREWALL_INFO}" != "" ]; then OFFSITE_FIREWALL_AMP=$(echo "${OFFSITE_FIREWALL_INFO}" | grep '"18":' | cut -d' ' -f 4 | sed 's/,//g')