diff --git a/inc/power.inc.sh b/inc/power.inc.sh index b0055589..17a7d765 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -958,8 +958,10 @@ POWERLOGGER_SERVICE(){ OFFSITE_FIREWALL_AMP=$(ROUND_NUMBER $(echo "scale=3; ${OFFSITE_FIREWALL_AMP}/1000" | bc -l) 2) OFFSITE_FIREWALL_WATT=$(echo "${OFFSITE_FIREWALL_INFO}" | grep '"19":' | cut -d' ' -f 4 | sed 's/,//g') OFFSITE_FIREWALL_WATT=$(echo "scale=1; ${OFFSITE_FIREWALL_WATT}/10" | bc -l) + OFFSITE_FIREWALL_VOLT=$(echo "${OFFSITE_FIREWALL_INFO}" | grep '"20":' | cut -d' ' -f 4 | sed 's/,//g') + OFFSITE_FIREWALL_VOLT=$(echo "scale=1; ${OFFSITE_FIREWALL_VOLT}/10" | bc -l) - QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['offsite-firewall']}','${LogDataTime}','${OFFSITE_FIREWALL_AMP}','${OFFSITE_FIREWALL_WATT}')" + QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`amp\`, \`watt\`, \`volt\`) VALUES ('${PW_POWERSENSOR_ID['offsite-firewall']}','${LogDataTime}','${OFFSITE_FIREWALL_AMP}','${OFFSITE_FIREWALL_WATT}','${OFFSITE_FIREWALL_VOLT}')" ${mysql_conn} -e "USE servermonitor; ${QRY}" fi OFFSITE_WIFI_INFO=$(curl -m 3 -s http://${PW_TUYA_API}/status/${PW_SENSOR_DEVICEID['offsite-wifi']} | jq '.dps') @@ -968,8 +970,10 @@ POWERLOGGER_SERVICE(){ OFFSITE_WIFI_AMP=$(ROUND_NUMBER $(echo "scale=3; ${OFFSITE_WIFI_AMP}/1000" | bc -l) 2) OFFSITE_WIFI_WATT=$(echo "${OFFSITE_WIFI_INFO}" | grep '"5":' | cut -d' ' -f 4 | sed 's/,//g') OFFSITE_WIFI_WATT=$(echo "scale=1; ${OFFSITE_WIFI_WATT}/10" | bc -l) + OFFSITE_WIFI_VOLT=$(echo "${OFFSITE_WIFI_INFO}" | grep '"6":' | cut -d' ' -f 4 | sed 's/,//g') + OFFSITE_WIFI_VOLT=$(echo "scale=1; ${OFFSITE_WIFI_VOLT}/10" | bc -l) - QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`amp\`, \`watt\`) VALUES ('${PW_POWERSENSOR_ID['offsite-wifi']}','${LogDataTime}','${OFFSITE_WIFI_AMP}','${OFFSITE_WIFI_WATT}')" + QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`amp\`, \`watt\`, \`volt\`) VALUES ('${PW_POWERSENSOR_ID['offsite-wifi']}','${LogDataTime}','${OFFSITE_WIFI_AMP}','${OFFSITE_WIFI_WATT}','${OFFSITE_WIFI_VOLT}')" ${mysql_conn} -e "USE servermonitor; ${QRY}" fi