Update power.inc.sh
This commit is contained in:
@@ -379,26 +379,26 @@ CHECKPOWER(){
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
DIVIDER . lightCyan ${PRI_WIDTH}
|
# DIVIDER . lightCyan ${PRI_WIDTH}
|
||||||
[ "${avgdays}" != "" ] && echo -e " --${idsCL[LightYellow]}${avgdays_disp}-Averages---"
|
# [ "${avgdays}" != "" ] && echo -e " --${idsCL[LightYellow]}${avgdays_disp}-Averages---"
|
||||||
echo -en "${idsCL[LightCyan]}Totals Amps Watts"
|
# echo -en "${idsCL[LightCyan]}Totals Amps Watts"
|
||||||
[ "${avgdays}" != "" ] && echo -e " Amps Watts" || echo
|
# [ "${avgdays}" != "" ] && echo -e " Amps Watts" || echo
|
||||||
AW=${TOTAL_MISC_WATTS}
|
# 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
|
# 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"
|
# echo -en "${idsCL[White]}Mainsite Equipment ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AW} 1 yes`'W"
|
||||||
if [ "${avgdays}" != "" ]; then
|
# if [ "${avgdays}" != "" ]; then
|
||||||
echo -en "${idsCL[Yellow]} Calculating Mainsite Equipment Total Averages ... "
|
# echo -en "${idsCL[Yellow]} Calculating Mainsite Equipment Total Averages ... "
|
||||||
UPS_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['mainsite-ups']} ${avgdays} both)
|
# UPS_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['mainsite-ups']} ${avgdays} both)
|
||||||
UPS_AMP_avg=$(echo ${UPS_avg} | cut -d'~' -f 1)
|
# UPS_AMP_avg=$(echo ${UPS_avg} | cut -d'~' -f 1)
|
||||||
UPS_WATT_avg=$(echo ${UPS_avg} | cut -d'~' -f 2)
|
# UPS_WATT_avg=$(echo ${UPS_avg} | cut -d'~' -f 2)
|
||||||
echo -en "\r\033[K"
|
# 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"
|
# 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
|
# 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"
|
# echo -e "${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_WATT_avg} 1 yes`'W"
|
||||||
else
|
# else
|
||||||
echo
|
# echo
|
||||||
fi
|
# fi
|
||||||
|
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user