From f947c90cb612ae2ec4e448549bd76e38733e302f Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 31 May 2025 12:40:46 -0500 Subject: [PATCH] Update power.inc.sh --- inc/power.inc.sh | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 193348c1..ee58d5a1 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -379,26 +379,26 @@ CHECKPOWER(){ fi done - DIVIDER . lightCyan ${PRI_WIDTH} - [ "${avgdays}" != "" ] && echo -e " --${idsCL[LightYellow]}${avgdays_disp}-Averages---" - echo -en "${idsCL[LightCyan]}Totals Amps Watts" - [ "${avgdays}" != "" ] && echo -e " Amps Watts" || echo - AW=${TOTAL_MISC_WATTS} - AD=$(IDS_NUMBER_FORMAT ${TOTAL_MISC_AMPS} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done - echo -en "${idsCL[White]}Mainsite Equipment ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AW} 1 yes`'W" - if [ "${avgdays}" != "" ]; then - echo -en "${idsCL[Yellow]} Calculating Mainsite Equipment Total Averages ... " - UPS_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['mainsite-ups']} ${avgdays} both) - UPS_AMP_avg=$(echo ${UPS_avg} | cut -d'~' -f 1) - UPS_WATT_avg=$(echo ${UPS_avg} | cut -d'~' -f 2) - echo -en "\r\033[K" - echo -en "${idsCL[White]}Mainsite Equipment ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AW} 1 yes`'W" - - AD=$(IDS_NUMBER_FORMAT ${OFFSITE_AMP_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done - echo -e "${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_WATT_avg} 1 yes`'W" - else - echo - fi + # DIVIDER . lightCyan ${PRI_WIDTH} + # [ "${avgdays}" != "" ] && echo -e " --${idsCL[LightYellow]}${avgdays_disp}-Averages---" + # echo -en "${idsCL[LightCyan]}Totals Amps Watts" + # [ "${avgdays}" != "" ] && echo -e " Amps Watts" || echo + # AW=${TOTAL_MISC_WATTS} + # AD=$(IDS_NUMBER_FORMAT ${TOTAL_MISC_AMPS} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done + # echo -en "${idsCL[White]}Mainsite Equipment ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AW} 1 yes`'W" + # if [ "${avgdays}" != "" ]; then + # echo -en "${idsCL[Yellow]} Calculating Mainsite Equipment Total Averages ... " + # UPS_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['mainsite-ups']} ${avgdays} both) + # UPS_AMP_avg=$(echo ${UPS_avg} | cut -d'~' -f 1) + # UPS_WATT_avg=$(echo ${UPS_avg} | cut -d'~' -f 2) + # echo -en "\r\033[K" + # echo -en "${idsCL[White]}Mainsite Equipment ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AW} 1 yes`'W" + # + # AD=$(IDS_NUMBER_FORMAT ${OFFSITE_AMP_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done + # echo -e "${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_WATT_avg} 1 yes`'W" + # else + # echo + # fi fi