From 5d8927e83d197baf0d8ca290fd223b7dd2c16a93 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 19 Jul 2025 10:13:38 -0500 Subject: [PATCH] Update power.inc.sh --- inc/power.inc.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 53ab7a34..b8476153 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -17,17 +17,16 @@ AVERAGEPOWER(){ logsfound_watt=0; total_amp=0 total_watt=0 - echo "HERE: ${sensorid}-" while IFS=$'\t' read date amp watt ;do if [ "${amp}" != "" ] && [ "${amp}" != "0" ] && [ "${amp}" != "0.00" ] && [ "${amp}" != "NULL" ] && [[ "${amp}" =~ ^[0-9]+(\.[0-9]+)?$ ]]; then total_amp=$(bc <<< "scale=2; ${total_amp}+${amp}") ((logsfound_amp++)) - echo "A:${amp}-${total_amp}=${average_amp}" + # echo "A:${amp}-${total_amp}=${average_amp}" fi if [ "${watt}" != "" ] && [ "${watt}" != "0" ] && [ "${watt}" != "0.00" ] && [ "${watt}" != "NULL" ] && [[ "${watt}" =~ ^[0-9]+(\.[0-9]+)?$ ]]; then total_watt=$(bc <<< "scale=2; ${total_watt}+${watt}") ((logsfound_watt++)) - echo "W:${watt}-${total_watt}=${average_watt}" + # echo "W:${watt}-${total_watt}=${average_watt}" fi done < <(${mysql_conn} -se "USE servermonitor; SELECT date,amp,watt from power_data WHERE sensorid=${sensorid} AND date >= DATE_SUB(NOW(), INTERVAL ${interval}) ORDER BY id DESC;") if [ "${logsfound_watt}" != "0" ]; then @@ -532,7 +531,7 @@ CHECKPOWER(){ [ ${REPORT} -eq 0 ] && echo -e "${spc3}${VOLT}'V${idsCL[Default]}" else echo -en "${idsCL[Yellow]} Calculating ${avgdays_disp} Average ... " - AVERAGEPOWER ${PW_POWERSENSOR_ID[${mSENSOR}]} ${avgdays} both + # AVERAGEPOWER ${PW_POWERSENSOR_ID[${mSENSOR}]} ${avgdays} both avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${mSENSOR}]} ${avgdays} both) AMP_avg=$(echo ${avg} | cut -d'~' -f 1) WATT_avg=$(echo ${avg} | cut -d'~' -f 2)