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:48:25 -06:00
parent 292fa312ec
commit 4da76f7a9a
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
inc/power.inc.sh
View File

@@ -1,24 +1,32 @@
AVERAGEPOWER(){ AVERAGEPOWER(){
sensorid=${1} sensorid=${1}
daysback=${2} daysback=${2}
logsfound=0;
if [ "${3}" == "both" ]; then if [ "${3}" == "both" ]; then
logsfound_amp=0;
logsfound_watt=0;
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}" != "" ] && [ "${amp}" != "null" ]; then
total_watt=$(bc <<< "scale=2; ${total_watt}+${watt}") total_amp=$(bc <<< "scale=2; ${total_amp}+${amp}")
((logsfound++)) ((logsfound_amp++))
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() AND amp IS NOT NULL AND watt IS NOT NULL ORDER BY id DESC;") fi
if [ "${logsfound}" != "0" ]; then if [ "${watt}" != "" ] && [ "${watt}" != "null" ]; then
average_amp=$(bc <<< "scale=2; ${total_amp}/${logsfound}") total_watt=$(bc <<< "scale=2; ${total_watt}+${watt}")
average_watt=$(bc <<< "scale=2; ${total_watt}/${logsfound}") ((logsfound_watt++))
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() AND amp IS NOT NULL AND watt IS NOT NULL 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_watt}" != "0" ]; then
average_amp=$(bc <<< "scale=2; ${total_amp}/${logsfound_amp}")
average_watt=$(bc <<< "scale=2; ${total_watt}/${logsfound_watt}")
else else
average_amp=0 average_amp=0
average_watt=0 average_watt=0
fi fi
echo "${average_amp}~${average_watt}" echo "${average_amp}~${average_watt}"
else else
logsfound=0;
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