voltron/powerwall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update power.inc.sh

Browse Source
This commit is contained in:
David Schroeder
2024-01-13 10:15:22 -06:00
parent 874115abba
commit 9aa81123bb
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
inc/power.inc.sh
View File

@@ -6,9 +6,11 @@ AVERAGEPOWER(){
total_amp=0 total_amp=0
total_watt=0 total_watt=0
while IFS=$'\t' read date amp watt ;do while IFS=$'\t' read date amp watt ;do
total_amp=$(bc <<< "scale=2; ${total_amp}+${amp}") if [ "${amp}" != "" ] && [ "${watt}" != "" ]; then
total_watt=$(bc <<< "scale=2; ${total_watt}+${watt}") total_amp=$(bc <<< "scale=2; ${total_amp}+${amp}")
((logsfound++)) total_watt=$(bc <<< "scale=2; ${total_watt}+${watt}")
((logsfound++))
fi
done < <(${mysql_conn} -se "USE servermonitor; SELECT date,amp,watt from power_data WHERE sensorid=${sensorid} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() ORDER BY id DESC;") done < <(${mysql_conn} -se "USE servermonitor; SELECT date,amp,watt from power_data WHERE sensorid=${sensorid} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() ORDER BY id DESC;")
if [ "${logsfound}" != "0" ]; then if [ "${logsfound}" != "0" ]; then
average_amp=$(bc <<< "scale=2; ${total_amp}/${logsfound}") average_amp=$(bc <<< "scale=2; ${total_amp}/${logsfound}")
@@ -22,8 +24,10 @@ AVERAGEPOWER(){
total=0 total=0
[ "${3}" != "" ] && ptype=${3} || ptype=watt [ "${3}" != "" ] && ptype=${3} || ptype=watt
while IFS=$'\t' read date ${ptype} ;do while IFS=$'\t' read date ${ptype} ;do
total=$(bc <<< "scale=2; ${total}+${!ptype}") if [ "${!ptype}" != "" ]; then
((logsfound++)) total=$(bc <<< "scale=2; ${total}+${!ptype}")
((logsfound++))
fi
done < <(${mysql_conn} -se "USE servermonitor; SELECT date,${ptype} from power_data WHERE sensorid=${sensorid} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() ORDER BY id DESC;") done < <(${mysql_conn} -se "USE servermonitor; SELECT date,${ptype} from power_data WHERE sensorid=${sensorid} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${daysback} DAY) AND NOW() ORDER BY id DESC;")
[ "${logsfound}" != "0" ] && average=$(bc <<< "scale=2; ${total}/${logsfound}") || average=0 [ "${logsfound}" != "0" ] && average=$(bc <<< "scale=2; ${total}/${logsfound}") || average=0
echo ${average} echo ${average}