Update power.inc.sh
This commit is contained in:
@@ -354,10 +354,12 @@ CHECKPOWER(){
|
||||
echo -e "${idsCL[White]}UPS Battery Voltage ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_VOLT}'volts${idsCL[Default]}"
|
||||
echo
|
||||
fi
|
||||
|
||||
TOTAL_MISC_WATTS=0; TOTAL_MISC_AMPS=0
|
||||
if [ ${REPORT} -eq 0 ]; then
|
||||
echo -en "${idsCL[LightCyan]}Misc Sensors Amps Watts"
|
||||
[ "${avgdays}" != "" ] && echo -e " Amps Watts" || echo -e " Volts"
|
||||
|
||||
TOTAL_MISC_WATTS=0; TOTAL_MISC_AMPS=0
|
||||
for mSENSOR in "${!OFFSITE_MISC[@]}"; do
|
||||
IFS=: read -r AMP WATT VOLT <<< ${OFFSITE_MISC[${mSENSOR}]}; unset IFS
|
||||
TOTAL_MISC_WATTS=`echo "scale=2; ${TOTAL_MISC_WATTS}+${WATT}" | bc`
|
||||
@@ -375,13 +377,14 @@ CHECKPOWER(){
|
||||
avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${mSENSOR}]} ${avgdays} both)
|
||||
AMP_avg=$(echo ${avg} | cut -d'~' -f 1)
|
||||
WATT_avg=$(echo ${avg} | cut -d'~' -f 2)
|
||||
echo -en "\r\033[K"
|
||||
[ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
|
||||
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} 1 yes`'W"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
DIVIDER . lightCyan ${PRI_WIDTH}
|
||||
[ "${avgdays}" != "" ] && echo -e " --${idsCL[LightYellow]}${avgdays_disp}-Averages---"
|
||||
|
||||
Reference in New Issue
Block a user