diff --git a/powerwall.sh b/powerwall.sh index eb2b0cc0..34583de4 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -200,13 +200,13 @@ NORMAL TEMP: ${temp_f}'F" } CHECKPOWER(){ - JSONSTATS=$(curl -s "http://10.10.0.61/stats.json") - INPUTV=`echo ${JSONSTATS} | jq '.inputs .inV'` - INPUTA=`echo ${JSONSTATS} | jq '.inputs .inA'` - OUTPUTV=`echo ${JSONSTATS} | jq '.outputs .outV'` - OUTPUTA=`echo ${JSONSTATS} | jq '.outputs .outA'` - BATTV=`echo ${JSONSTATS} | jq '.inputs .battV'` - BATTA=`echo ${JSONSTATS} | jq '.inputs .xfA'` + INVSTATSINFO=$(curl -s "http://10.10.0.61/stats.json") + INPUTV=`echo ${INVSTATSINFO} | jq '.inputs .inV'` + INPUTA=`echo ${INVSTATSINFO} | jq '.inputs .inA'` + OUTPUTV=`echo ${INVSTATSINFO} | jq '.outputs .outV'` + OUTPUTA=`echo ${INVSTATSINFO} | jq '.outputs .outA'` + BATTV=`echo ${INVSTATSINFO} | jq '.inputs .battV'` + BATTA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'` OUTPUTV2=$(awk -vp_val="$OUTPUTV" 'BEGIN{print p_val/2}') OUTPUTA2=$(awk -vp_val="$OUTPUTA" 'BEGIN{print p_val*2}') @@ -328,41 +328,39 @@ CHECKPOWER_SERVICE(){ } POWERLOGGER(){ - JSONSTATS=${1} + INVSTATSINFO=${1} datetime=`date +'%Y-%m-%d %H:%M:%S'` - # JSONSTATS=$(curl -s "http://10.10.0.61/stats.json") - inV=`echo ${JSONSTATS} | jq '.inputs .inV'` - inA=`echo ${JSONSTATS} | jq '.inputs .inA'` - outV=`echo ${JSONSTATS} | jq '.outputs .outV'` - outA=`echo ${JSONSTATS} | jq '.outputs .outA'` - battV=`echo ${JSONSTATS} | jq '.inputs .battV'` - xfA=`echo ${JSONSTATS} | jq '.inputs .xfA'` + # INVSTATSINFO=$(curl -s "http://10.10.0.61/stats.json") + inV=`echo ${INVSTATSINFO} | jq '.inputs .inV'` + inA=`echo ${INVSTATSINFO} | jq '.inputs .inA'` + outV=`echo ${INVSTATSINFO} | jq '.outputs .outV'` + outA=`echo ${INVSTATSINFO} | jq '.outputs .outA'` + battV=`echo ${INVSTATSINFO} | jq '.inputs .battV'` + xfA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'` - echo "${inA} - ${outA} - ${xfA}" + QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('3','${datetime}','${inV}','${inA}')" + ${mysql_conn} -e "USE servermonitor; ${QRY}" + QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('4','${datetime}','${outV}','${outA}')" + ${mysql_conn} -e "USE servermonitor; ${QRY}" + QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('5','${datetime}','${battV}','${xfA}')" + ${mysql_conn} -e "USE servermonitor; ${QRY}" + QRY="INSERT INTO inv_jsonstats (\`date\`, \`data\`) VALUES ('${datetime}','${INVSTATSINFO}')" + ${mysql_conn} -e "USE servermonitor; ${QRY}" - # QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('3','${datetime}','${inV}','${inA}')" - # ${mysql_conn} -e "USE servermonitor; ${QRY}" - # QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('4','${datetime}','${outV}','${outA}')" - # ${mysql_conn} -e "USE servermonitor; ${QRY}" - # QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('5','${datetime}','${battV}','${xfA}')" - # ${mysql_conn} -e "USE servermonitor; ${QRY}" - # QRY="INSERT INTO inv_jsonstats (\`date\`, \`data\`) VALUES ('${datetime}','${JSONSTATS}')" - # ${mysql_conn} -e "USE servermonitor; ${QRY}" - - # touch ${TMPFOLDER}/powerlogger.insert + touch ${TMPFOLDER}/powerlogger.insert } POWERLOGGER_SERVICE(){ while true; do datetime=`date +'%Y-%m-%d %H:%M:%S'` - JSONSTATS=$(curl -s "http://10.10.0.61/stats.json") - inV=`echo ${JSONSTATS} | jq '.inputs .inV'` - inA=`echo ${JSONSTATS} | jq '.inputs .inA'` - outV=`echo ${JSONSTATS} | jq '.outputs .outV'` - outA=`echo ${JSONSTATS} | jq '.outputs .outA'` - battV=`echo ${JSONSTATS} | jq '.inputs .battV'` - xfA=`echo ${JSONSTATS} | jq '.inputs .xfA'` + INVSTATSINFO=$(curl -s "http://10.10.0.61/stats.json") + inV=`echo ${INVSTATSINFO} | jq '.inputs .inV'` + inA=`echo ${INVSTATSINFO} | jq '.inputs .inA'` + outV=`echo ${INVSTATSINFO} | jq '.outputs .outV'` + outA=`echo ${INVSTATSINFO} | jq '.outputs .outA'` + battV=`echo ${INVSTATSINFO} | jq '.inputs .battV'` + xfA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'` QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('3','${datetime}','${inV}','${inA}')" ${mysql_conn} -e "USE servermonitor; ${QRY}" @@ -370,7 +368,7 @@ POWERLOGGER_SERVICE(){ ${mysql_conn} -e "USE servermonitor; ${QRY}" QRY="INSERT INTO power_data (\`sensorid\`, \`date\`, \`volt\`, \`amp\`) VALUES ('5','${datetime}','${battV}','${xfA}')" ${mysql_conn} -e "USE servermonitor; ${QRY}" - QRY="INSERT INTO inv_jsonstats (\`date\`, \`data\`) VALUES ('${datetime}','${JSONSTATS}')" + QRY="INSERT INTO inv_jsonstats (\`date\`, \`data\`) VALUES ('${datetime}','${INVSTATSINFO}')" ${mysql_conn} -e "USE servermonitor; ${QRY}" @@ -658,7 +656,7 @@ TEST(){ echo "Average: ${average}" echo - # QRY="INSERT INTO inv_jsonstats (\`date\`, \`data\`) VALUES ('${datetime}','${JSONSTATS}')" + # QRY="INSERT INTO inv_jsonstats (\`date\`, \`data\`) VALUES ('${datetime}','${INVSTATSINFO}')" # ${mysql_conn} -e "USE servermonitor; ${QRY}" }