From e75d0a8084aa3c9ef311140d42985a27a29d055b Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 29 Nov 2023 22:17:21 -0600 Subject: [PATCH] Update powerwall.sh --- powerwall.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/powerwall.sh b/powerwall.sh index 32ea59a3..07d301d2 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -572,7 +572,7 @@ CHECKPOWER(){ echo echo -e "${idsCL[White]}Inverter Output Volts ${idsCL[Default]}: ${idsCL[Green]}${OUTPUTV}'volts / ${OUTPUTV2}'volts" echo -e "${idsCL[White]}Inverter Output Amps ${idsCL[Default]}: ${idsCL[Green]}${OUTPUTA}'amps / ${OUTPUTA2}'amps" - echo -e "${idsCL[White]}Inverter Output Watts ${idsCL[Default]}: ${idsCL[Green]}`printf "%'.2f\n" ${OUTPUTW}`'watts" + echo -e "${idsCL[White]}Inverter Output Watts ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OUTPUTW} 2`'watts" echo echo -e "${idsCL[White]}Battery Voltage ${idsCL[Default]}: ${idsCL[Green]}${BATTV}'volts ~ ${BATTLIFE}%${idsCL[Default]}" echo -e "${idsCL[White]}Battery Amps Chg/DChg ${idsCL[Default]}: ${BATTA_disp}${idsCL[Default]}" @@ -601,7 +601,7 @@ CHECKPOWER(){ else average_disp="" fi - echo -e "${idsCL[White]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`printf "%'.2f\n" ${APCPDU_WATT}`'watts ~ estimate${average_disp} ${idsCL[LightCyan]}(`printf "%'.2f\n" ${APCPDU_WATT2}` watts)${idsCL[Default]}" + echo -e "${idsCL[White]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT} 2`'watts ~ estimate${average_disp} ${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${APCPDU_WATT2} 2` watts)${idsCL[Default]}" echo if [ "${SVRRM_VOLT}" != "" ]; then @@ -620,7 +620,7 @@ CHECKPOWER(){ else average_disp="" fi - echo -e "${idsCL[White]}NetworkRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`printf "%'.2f\n" ${NETRK_WATT}`'watts ~ estimate${average_disp} ${idsCL[LightCyan]}(`printf "%'.2f\n" ${NETRK_WATT2}` watts)${idsCL[Default]}" + echo -e "${idsCL[White]}NetworkRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 2`'watts ~ estimate${average_disp} ${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${NETRK_WATT2} 2` watts)${idsCL[Default]}" echo echo -e "${idsCL[White]}Voltage ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLT}'volts${idsCL[Default]}" @@ -632,7 +632,7 @@ CHECKPOWER(){ else average_disp="" fi - echo -e "${idsCL[White]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}`printf "%'.2f\n" ${SVRRM_WATT}`'watts${average_disp}${idsCL[Default]}" + echo -e "${idsCL[White]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 2`'watts${average_disp}${idsCL[Default]}" echo fi