From 32d879e64ebd19f3cd591fb6410bddc49806567b Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 29 Nov 2023 22:45:11 -0600 Subject: [PATCH] Update powerwall.sh --- powerwall.sh | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/powerwall.sh b/powerwall.sh index f0370055..c05b6249 100755 --- a/powerwall.sh +++ b/powerwall.sh @@ -556,25 +556,25 @@ CHECKPOWER(){ BATTLIFE=`echo "scale=2; (${BATTV}*100)/54.6" | bc` if (( $(bc <<<"${BATTV} > 54.8") )); then if (( $(bc <<<"${BATTV} > 58") )); then - BATTA_disp="${idsCL[Green]}`IDS_NUMBER_FORMAT ${BATTA} 2`'amps ${idsCL[LightCyan]}- Bulk Charging" + BATTA_disp="${idsCL[Green]}`IDS_NUMBER_FORMAT ${BATTA}`'amps ${idsCL[LightCyan]}- Bulk Charging" else - BATTA_disp="${idsCL[Green]}`IDS_NUMBER_FORMAT ${BATTA} 2`'amps ${idsCL[LightCyan]}- Float Charging" + BATTA_disp="${idsCL[Green]}`IDS_NUMBER_FORMAT ${BATTA}`'amps ${idsCL[LightCyan]}- Float Charging" fi elif [ "${BATTA}" == "-0.1" ]; then - BATTA_disp="${idsCL[LightCyan]}`IDS_NUMBER_FORMAT ${BATTA} 2`'amps ${idsCL[LightCyan]}- Standby" + BATTA_disp="${idsCL[LightCyan]}`IDS_NUMBER_FORMAT ${BATTA}`'amps ${idsCL[LightCyan]}- Standby" else - BATTA_disp="${idsCL[LightRed]}`IDS_NUMBER_FORMAT ${BATTA} 2`'amps ${idsCL[LightCyan]}- Discharging" + BATTA_disp="${idsCL[LightRed]}`IDS_NUMBER_FORMAT ${BATTA}`'amps ${idsCL[LightCyan]}- Discharging" fi fi - echo -e "${idsCL[White]}Inverter Input Volts ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${INPUTV} 2`'volts" - echo -e "${idsCL[White]}Inverter Input Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${INPUTA} 2`'amps" + echo -e "${idsCL[White]}Inverter Input Volts ${idsCL[Default]}: ${idsCL[LightGreen]}`IDS_NUMBER_FORMAT ${INPUTV}`${idsCL[Green]}'volts" + echo -e "${idsCL[White]}Inverter Input Amps ${idsCL[Default]}: ${idsCL[LightGreen]}`IDS_NUMBER_FORMAT ${INPUTA}`${idsCL[Green]}'amps" echo - echo -e "${idsCL[White]}Inverter Output Volts ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OUTPUTV} 2`'volts / ${OUTPUTV2}'volts" - echo -e "${idsCL[White]}Inverter Output Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OUTPUTA} 2`'amps / ${OUTPUTA2}'amps" - echo -e "${idsCL[White]}Inverter Output Watts ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OUTPUTW} 2`'watts" + echo -e "${idsCL[White]}Inverter Output Volts ${idsCL[Default]}: ${idsCL[LightGreen]}`IDS_NUMBER_FORMAT ${OUTPUTV}`${idsCL[Green]}'volts / ${idsCL[LightGreen]}`IDS_NUMBER_FORMAT ${OUTPUTV2}`${idsCL[Green]}'volts" + echo -e "${idsCL[White]}Inverter Output Amps ${idsCL[Default]}: ${idsCL[LightGreen]}`IDS_NUMBER_FORMAT ${OUTPUTA}`${idsCL[Green]}'amps / ${idsCL[LightGreen]}`IDS_NUMBER_FORMAT ${OUTPUTA2}`${idsCL[Green]}'amps" + echo -e "${idsCL[White]}Inverter Output Watts ${idsCL[Default]}: ${idsCL[LightGreen]}`IDS_NUMBER_FORMAT ${OUTPUTW}`${idsCL[Green]}'watts" echo - echo -e "${idsCL[White]}Battery Voltage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${BATTV} 2`$'volts ~ `IDS_NUMBER_FORMAT ${BATTLIFE} 2`%${idsCL[Default]}" + echo -e "${idsCL[White]}Battery Voltage ${idsCL[Default]}: ${idsCL[LightGreen]}`IDS_NUMBER_FORMAT ${BATTV}`${idsCL[Green]}'volts ~ ${idsCL[LightGreen]}`IDS_NUMBER_FORMAT ${BATTLIFE}`${idsCL[Green]}%" echo -e "${idsCL[White]}Battery Amps Chg/DChg ${idsCL[Default]}: ${BATTA_disp}${idsCL[Default]}" echo @@ -594,14 +594,14 @@ CHECKPOWER(){ APCPDU_WATT=`echo "scale=2; ${APCPDU_AMP}*${SVRRM_VOLT}" | bc` # fi - echo -e "${idsCL[White]}ServerRack Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_AMP} 2`'amps${idsCL[Default]}" + echo -e "${idsCL[White]}ServerRack Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_AMP}`'amps${idsCL[Default]}" if [ "${avgdays}" != "" ]; then average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['server-rack']} ${avgdays}) average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts" else average_disp="" fi - 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 -e "${idsCL[White]}ServerRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT}`'watts ~ estimate${average_disp} ${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${APCPDU_WATT2}` 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]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 2`'watts ~ estimate${average_disp} ${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${NETRK_WATT2} 2` watts)${idsCL[Default]}" + echo -e "${idsCL[White]}NetworkRack Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT}`'watts ~ estimate${average_disp} ${idsCL[LightCyan]}(`IDS_NUMBER_FORMAT ${NETRK_WATT2}` 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]}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 2`'watts${average_disp}${idsCL[Default]}" + echo -e "${idsCL[White]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT}`'watts${average_disp}${idsCL[Default]}" echo fi @@ -684,7 +684,7 @@ CHECKPOWER(){ else average_disp="" fi - echo -e "${idsCL[White]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_WATTS} 2`'watts ~ estimate${average_disp}${idsCL[Default]}" + echo -e "${idsCL[White]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_WATTS}`'watts ~ estimate${average_disp}${idsCL[Default]}" echo echo -e "${idsCL[White]}Battery Capacity ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_BATT_CAP}`%${idsCL[Default]}" echo -e "${idsCL[White]}Battery Runtime ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_RUNTIME}'Mins${idsCL[Default]}"