diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 5aa4e5a9..b87f68a4 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -156,6 +156,14 @@ CHECKPOWER(){ APCPDU_WATT2=$(snmpwalk -t 1 -r 0 -v 1 -c public ${PW_APCPDU_IP} .1.3.6.1.4.1.318.1.1.12.1.16.0 | sed 's/.*: //') APCPDU_WATT=`echo "scale=2; ${APCPDU_AMP}*${SVRRM_VOLTOUT}" | bc` # fi + if [ "${SVRRM_VOLTOUT}" != "" ]; then + if [ "${APCPDU_AMP}" != "" ]; then + NETRK_AMP=`echo "scale=2; ${SVRRM_AMP}-${APCPDU_AMP}" | bc` + NETRK_WATT=`echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT}" | bc` + NETRK_WATT2=`echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT2}" | bc` + fi + VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLTIN}" | bc` + fi [ ${REPORT} -eq 0 ] && echo -en "\r\033[K" echo -e "${idsCL[White]}Inverter State ${idsCL[Default]}: ${INV_STATE_disp}" @@ -188,15 +196,6 @@ CHECKPOWER(){ DIVIDER . lightCyan ${PRI_WIDTH} c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done echo -e "${idsCL[LightCyan]}Totals : Amps Watts${idsCL[Default]}" - - if [ "${SVRRM_VOLTOUT}" != "" ]; then - if [ "${APCPDU_AMP}" != "" ]; then - NETRK_AMP=`echo "scale=2; ${SVRRM_AMP}-${APCPDU_AMP}" | bc` - NETRK_WATT=`echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT}" | bc` - NETRK_WATT2=`echo "scale=2; ${SVRRM_WATT}-${APCPDU_WATT2}" | bc` - fi - VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLTIN}" | bc` - fi if [ ${REPORT} -eq 0 ]; then echo -en "\r\033[K"