diff --git a/powerwall.sh b/powerwall.sh index ef037156..9160799f 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -554,7 +554,7 @@ CHECKPOWER(){ BATTA=`echo ${INVSTATSINFO} | jq '.inputs .xfA'` fi - echo -e "${idsCL[LightCyan]}Inverter Input Power ${idsCL[Default]}: ${idsCL[Green]}${INPUTV}'V / ${INPUTA}A" + echo -e "${idsCL[LightCyan]}Inverter Input Power ${idsCL[Default]}: ${idsCL[Green]}${INPUTV}'V / ${INPUTA}'A" echo -e "${idsCL[LightCyan]}Inverter Output Power ${idsCL[Default]}: ${idsCL[Green]}${OUTPUTV}'V / ${OUTPUTA}'A (${OUTPUTA2}'A @ ${OUTPUTV2}'V)" echo -e "${idsCL[LightCyan]}Battery Power ${idsCL[Default]}: ${idsCL[Green]}${BATTV}'V / ${BATTA}'A ${idsCL[Default]}" echo @@ -573,8 +573,8 @@ CHECKPOWER(){ APCPDU_WATT=`echo "scale=1; ${APCPDU_AMP}*${SVRRM_VOLT}" | bc` fi - echo -e "${idsCL[LightCyan]}ServerRack Amps ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP} A${idsCL[Default]}" - echo -e "${idsCL[LightCyan]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_WATT} W${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}ServerRack Amps ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP}'A${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_WATT}'W${idsCL[Default]}" echo if [ "$(CHECK_HOST 10.10.1.205)" != "false" ]; then @@ -585,14 +585,14 @@ CHECKPOWER(){ VOLT_DROP=`echo "scale=1; ${OUTPUTV2}-${SVRRM_VOLT}" | bc` fi - echo -e "${idsCL[LightCyan]}NetworkRack Amps ${idsCL[Default]}: ${idsCL[Green]}${NETRK_AMP} A${idsCL[Default]}" - echo -e "${idsCL[LightCyan]}NetworkRack Wattage ${idsCL[Default]}: ${idsCL[Green]}${NETRK_WATT} W${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}NetworkRack Amps ${idsCL[Default]}: ${idsCL[Green]}${NETRK_AMP}'A${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}NetworkRack Wattage ${idsCL[Default]}: ${idsCL[Green]}${NETRK_WATT}'W${idsCL[Default]}" echo - echo -e "${idsCL[LightCyan]}Voltage ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLT} V${idsCL[Default]}" - echo -e "${idsCL[LightCyan]}Voltage Drop ${idsCL[Default]}: ${idsCL[Red]}${VOLT_DROP} V${idsCL[Default]}" - echo -e "${idsCL[LightCyan]}Total Amps ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP} A${idsCL[Default]}" - echo -e "${idsCL[LightCyan]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_WATT} W${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}Voltage ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLT}'V${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}Voltage Drop ${idsCL[Default]}: ${idsCL[Red]}${VOLT_DROP}'V${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}Total Amps ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'A${idsCL[Default]}" + echo -e "${idsCL[LightCyan]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_WATT}'W${idsCL[Default]}" echo fi @@ -606,7 +606,7 @@ CHECKPOWER(){ watts=$(cat ${hostfile}) if [ "${watts}" == "down" ]; then hostpower="${idsCL[Red]}Host Offline" elif [ "${watts}" == "0" ]; then hostpower="${idsCL[Default]}n/a" - else hostpower="${idsCL[Green]}${watts} W" + else hostpower="${idsCL[Green]}${watts}'W" fi echo -e "${idsCL[LightCyan]}HOST '${PW_iDRACHOST_SHORTNAMES[${host}]}' ${idsCL[Default]}: ${hostpower}${idsCL[Default]}" mv ${hostfile} ${hostfile}.done