From 7c59e466c91e74113f540f7f2cf590c00a4b85e0 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 11 Aug 2024 23:09:14 -0500 Subject: [PATCH] Update power.inc.sh --- inc/power.inc.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index c14e110d..076e63a2 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -352,7 +352,7 @@ CHECKPOWER(){ TOTAL_MISC_AMPS=`echo "scale=2; ${TOTAL_MISC_AMPS}+${AMP}" | bc` AD1="${PW_MISCSENSOR_DESC[${mSENSOR}]}"; c=0; spc1=''; spca=`expr 25 - ${#AD1}`; until [ ${c} = ${spca} ]; do spc1="${spc1} "; ((c++)); done AD2=$(IDS_NUMBER_FORMAT ${AMP} 2 yes); c=0; spc2=''; spca=`expr ${wspc} - ${#AD2}`; until [ ${c} = ${spca} ]; do spc2="${spc2} "; ((c++)); done - AD3=$(IDS_NUMBER_FORMAT ${WATT} 0) + AD3=$(IDS_NUMBER_FORMAT ${WATT} 1) echo -en "${idsCL[Default]}${AD1}${spc1}: ${idsCL[Green]}${AD2}'A${spc2}${AD3}'W" if [ "${avgdays}" == "" ]; then @@ -367,7 +367,7 @@ CHECKPOWER(){ echo -en "${idsCL[Default]}${AD1}${spc1}: ${idsCL[Green]}${AD2}'A${spc2}${AD3}'W" AD=$(IDS_NUMBER_FORMAT ${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 ${WATT_avg} 0`'W" + echo -e "${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${WATT_avg} 1 yes`'W" fi done @@ -383,17 +383,17 @@ CHECKPOWER(){ AD=${OFFSITE_AMPS} fi AD=$(IDS_NUMBER_FORMAT ${AD} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done - echo -en "${idsCL[White]}Offsite Equipment ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AW} 0`'W" + echo -en "${idsCL[White]}Offsite Equipment ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AW} 1 yes`'W" if [ "${avgdays}" != "" ]; then echo -en "${idsCL[Yellow]} Calculating Offsite Equipment Total Averages ... " OFFSITE_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['offsite-ups']} ${avgdays} both) OFFSITE_AMP_avg=$(echo ${OFFSITE_avg} | cut -d'~' -f 1) OFFSITE_WATT_avg=$(echo ${OFFSITE_avg} | cut -d'~' -f 2) echo -en "\r\033[K" - echo -en "${idsCL[White]}Offsite Equipment ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AW} 0`'W" + echo -en "${idsCL[White]}Offsite 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} 0`'W" + echo -e "${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_WATT_avg} 1 yes`'W" else echo fi