Update power.inc.sh
This commit is contained in:
@@ -340,21 +340,38 @@ CHECKPOWER(){
|
||||
|
||||
AD1=$(IDS_NUMBER_FORMAT ${UPS_AMPSIN} 2 yes); c=0; spc1=''; spca=`expr ${wspc} - ${#AD1}`; until [ ${c} = ${spca} ]; do spc1="${spc1} "; ((c++)); done
|
||||
echo -en "${idsCL[White]}UPS Input ${idsCL[Default]}: ${idsCL[Green]}${AD1}'A${spc1}`IDS_NUMBER_FORMAT ${UPS_VOLTIN}`'V${idsCL[Default]}"
|
||||
if [ "${avgdays}" == "" ]; then
|
||||
echo ""
|
||||
else
|
||||
if [ "${avgdays}" != "" ]; then
|
||||
echo -en "${idsCL[Yellow]} Calculating ${avgdays_disp} Average ... "
|
||||
AMP_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['ups-input']} ${avgdays} amp)
|
||||
[ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
|
||||
echo -e "${idsCL[White]}UPS Input ${idsCL[Default]}: ${idsCL[Green]}${AD1}'A${spc1}`IDS_NUMBER_FORMAT ${UPS_VOLTIN}`'V${idsCL[LightYellow]} ${AD}'A${idsCL[Default]}"
|
||||
echo -e "${idsCL[White]}UPS Input ${idsCL[Default]}: ${idsCL[Green]}${AD1}'A${spc1}`IDS_NUMBER_FORMAT ${UPS_VOLTIN}`'V${idsCL[LightYellow]} ${AMP_avg}'A${idsCL[Default]}"
|
||||
else
|
||||
echo ""
|
||||
fi
|
||||
|
||||
AD2=$(IDS_NUMBER_FORMAT ${UPS_AMPSOUT} 2 yes); c=0; spc2=''; spca=`expr ${wspc} - ${#AD2}`; until [ ${c} = ${spca} ]; do spc2="${spc2} "; ((c++)); done
|
||||
echo -e "${idsCL[White]}UPS Output ${idsCL[Default]}: ${idsCL[Green]}${AD2}'A${spc1}`IDS_NUMBER_FORMAT ${UPS_VOLTOUT}`'V${idsCL[Default]}"
|
||||
if [ "${avgdays}" != "" ]; then
|
||||
echo -en "${idsCL[Yellow]} Calculating ${avgdays_disp} Average ... "
|
||||
AMP_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['ups-output']} ${avgdays} amp)
|
||||
[ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
|
||||
echo -e "${idsCL[White]}UPS Output ${idsCL[Default]}: ${idsCL[Green]}${AD2}'A${spc1}`IDS_NUMBER_FORMAT ${UPS_VOLTOUT}`'V${idsCL[LightYellow]} ${AMP_avg}'A${idsCL[Default]}"
|
||||
else
|
||||
echo ""
|
||||
fi
|
||||
|
||||
echo
|
||||
fi
|
||||
echo -e "${idsCL[White]}UPS Load Usage ${idsCL[Default]}: ${idsCL[Green]}${UPS_LOAD}'%${idsCL[Default]}"
|
||||
echo -e "${idsCL[White]}UPS Watts ${idsCL[Default]}: ${idsCL[Green]}${UPS_WATTS}'W${idsCL[Default]}"
|
||||
echo -en "${idsCL[White]}UPS Watts ${idsCL[Default]}: ${idsCL[Green]}${UPS_WATTS}'W${idsCL[Default]}"
|
||||
if [ "${avgdays}" != "" ]; then
|
||||
echo -en "${idsCL[Yellow]} Calculating ${avgdays_disp} Average ... "
|
||||
WATT_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['ups-output']} ${avgdays} watt)
|
||||
[ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
|
||||
echo -e "${idsCL[White]}UPS Watts ${idsCL[Default]}: ${idsCL[Green]}${UPS_WATTS}'W${idsCL[LightYellow]} ${WATT_avg}'W${idsCL[Default]}"
|
||||
else
|
||||
echo ""
|
||||
fi
|
||||
[ ${REPORT} -eq 0 ] && echo
|
||||
[ ${REPORT} -eq 0 ] && echo -e "${idsCL[White]}UPS Battery Voltage ${idsCL[Default]}: ${idsCL[Green]}${UPS_BATT_VOLT}'V${idsCL[Default]}"
|
||||
echo -e "${idsCL[White]}UPS Battery Capacity ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${UPS_BATT_CAP}`'%${idsCL[Default]}"
|
||||
|
||||
Reference in New Issue
Block a user