diff --git a/powerwall.sh b/powerwall.sh index 2bc8ef37..dabcc3e2 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -517,15 +517,15 @@ DAILYTEMP(){ } AVERAGEPOWER(){ - temptotal=0 + watttotal=0 sensorid=${1} daysback=${2} logsfound=0; - while IFS=$'\t' read date temp hum ;do - temptotal=$(bc <<< "scale=2; ${temptotal}+${temp}") + while IFS=$'\t' read date watt ;do + watttotal=$(bc <<< "scale=2; ${watttotal}+${watt}") ((logsfound++)) - echo "$temptotal-$logsfound" - done < <(${mysql_conn} -se "USE servermonitor; SELECT date,volt,amp,watt from power_data WHERE sensorid=${sensorid} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() ORDER BY id DESC;") + echo "$watttotal-$logsfound" + done < <(${mysql_conn} -se "USE servermonitor; SELECT date,watt from power_data WHERE sensorid=${sensorid} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() ORDER BY id DESC;") average=$(bc <<< "scale=2; ${temptotal}/${logsfound}") echo ${average} }