diff --git a/powerwall.sh b/powerwall.sh index fcc08423..3a6b206e 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -638,13 +638,17 @@ CHECKPOWER(){ echo -e "${idsCL[White]}Server Room Voltage OUT ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLTOUT}'volts${idsCL[Default]}" echo -e "${idsCL[LightCyan]}Voltage Drop ${idsCL[Default]}: ${idsCL[LightRed]}${VOLT_DROP}'volts${idsCL[Default]}" echo -e "${idsCL[White]}Server Room Amps ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'amps${idsCL[Default]}" + if [ "${avgdays}" != "" ]; then + echo -en "${idsCL[White]}Server Room Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT}`'watts${idsCL[LightYellow]} Calculating averages ...${idsCL[Default]}" average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total']} ${avgdays}) - average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts" + average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts" + echo -en "\r\033[K" + echo -e "${idsCL[White]}Server Room Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT}`'watts${idsCL[LightYellow]}${average_disp}${idsCL[Default]}" + else - average_disp="" + echo -e "${idsCL[White]}Server Room Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT}`'watts${idsCL[Default]}" fi - echo -e "${idsCL[White]}Server Room Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT}`'watts${average_disp}${idsCL[Default]}" echo fi