diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 351234ac..2ead6c0e 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -359,32 +359,31 @@ CHECKPOWER(){ if [ ${REPORT} -eq 0 ]; then echo -en "${idsCL[LightCyan]}Misc Sensors Amps Watts" [ "${avgdays}" != "" ] && echo -e " Amps Watts" || echo -e " Volts" - - 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` - 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} 1 yes) - - echo -en "${idsCL[Default]}${AD1}${spc1}: ${idsCL[Green]}${AD2}'A${spc2}${AD3}'W" - if [ "${avgdays}" == "" ]; then - c=0; spc3=''; spca=`expr ${wspc} - ${#AD3}`; until [ ${c} = ${spca} ]; do spc3="${spc3} "; ((c++)); done - echo -e "${spc3}${VOLT}'V${idsCL[Default]}" - else - echo -en "${idsCL[Yellow]} Calculating ${avgdays_disp} Average ... " - avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${mSENSOR}]} ${avgdays} both) - AMP_avg=$(echo ${avg} | cut -d'~' -f 1) - WATT_avg=$(echo ${avg} | cut -d'~' -f 2) - [ ${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 + 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` + 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} 1 yes) + + [ ${REPORT} -eq 0 ] && echo -en "${idsCL[Default]}${AD1}${spc1}: ${idsCL[Green]}${AD2}'A${spc2}${AD3}'W" + if [ "${avgdays}" == "" ]; then + c=0; spc3=''; spca=`expr ${wspc} - ${#AD3}`; until [ ${c} = ${spca} ]; do spc3="${spc3} "; ((c++)); done + [ ${REPORT} -eq 0 ] && echo -e "${spc3}${VOLT}'V${idsCL[Default]}" + else + echo -en "${idsCL[Yellow]} Calculating ${avgdays_disp} Average ... " + avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${mSENSOR}]} ${avgdays} both) + AMP_avg=$(echo ${avg} | cut -d'~' -f 1) + WATT_avg=$(echo ${avg} | cut -d'~' -f 2) + [ ${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 DIVIDER . lightCyan ${PRI_WIDTH} [ "${avgdays}" != "" ] && echo -e " --${idsCL[LightYellow]}${avgdays_disp}-Averages---"