diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 822843c8..29628c14 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -335,7 +335,10 @@ CHECKPOWER(){ if [ ${HOST_WATTS} -ne 0 ]; then if [ "${avgdays}" != "" ]; then echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}" - average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average} 0`'watts" + average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays} both) + average_amp=$(echo ${average} | cut -d'~' -f 1) + average_watt=$(echo ${average} | cut -d'~' -f 2) + average_disp="${idsCL[LightYellow]} ${average_amp}'amps - `IDS_NUMBER_FORMAT ${average_watt} 0`'watts" echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}" if [[ "${PW_MAINSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]]; then AVERAGE_WATTS_MAINSITE=`echo "scale=2; ${AVERAGE_WATTS_MAINSITE}+${average}" | bc`