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

update

Browse Source
This commit is contained in:
David Schroeder
2024-01-13 10:52:32 -06:00
parent 1e11f709c0
commit e552cce8b0
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,5 +1,5 @@
VERS='2.5.139-01132024' VERS='2.5.140-01132024'
noheader=' update service dailytemp confsync -r -report ' noheader=' update service dailytemp confsync -r -report '

10
inc/power.inc.sh
View File

@@ -7,7 +7,6 @@ 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
# echo "HERE: '${amp}'"
if [ "${amp}" != "" ] && [ "${amp}" != "NULL" ]; then if [ "${amp}" != "" ] && [ "${amp}" != "NULL" ]; then
total_amp=$(bc <<< "scale=2; ${total_amp}+${amp}") total_amp=$(bc <<< "scale=2; ${total_amp}+${amp}")
((logsfound_amp++)) ((logsfound_amp++))
@@ -16,7 +15,6 @@ AVERAGEPOWER(){
total_watt=$(bc <<< "scale=2; ${total_watt}+${watt}") total_watt=$(bc <<< "scale=2; ${total_watt}+${watt}")
((logsfound_watt++)) ((logsfound_watt++))
fi 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;") 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 if [ "${logsfound_watt}" != "0" ]; then
average_amp=$(bc <<< "scale=2; ${total_amp}/${logsfound_amp}") average_amp=$(bc <<< "scale=2; ${total_amp}/${logsfound_amp}")
@@ -31,9 +29,11 @@ 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}" != "" ] && [ "${!ptype}" != "NULL" ]; then
((logsfound++)) total=$(bc <<< "scale=2; ${total}+${!ptype}")
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() AND ${ptype} IS NOT NULL ORDER BY id DESC;") ((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;")
[ "${logsfound}" != "0" ] && average=$(bc <<< "scale=2; ${total}/${logsfound}") || average=0 [ "${logsfound}" != "0" ] && average=$(bc <<< "scale=2; ${total}/${logsfound}") || average=0
echo ${average} echo ${average}
fi fi