voltron/powerwall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update power.inc.sh

Browse Source
This commit is contained in:
David Schroeder
2024-02-11 09:07:53 -06:00
parent 96a0474715
commit 0d8e196771
1 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
inc/power.inc.sh
View File

@@ -228,10 +228,7 @@ CHECKPOWER(){
AD=$(IDS_NUMBER_FORMAT ${AIRCON_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done AD=$(IDS_NUMBER_FORMAT ${AIRCON_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
echo -e "${idsCL[White]}Air Conditioner ${idsCL[Default]}: ${idsCL[Green]}${AD}'amps${spc}${idsCL[Green]}`IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'watts ${idsCL[Default]}" echo -e "${idsCL[White]}Air Conditioner ${idsCL[Default]}: ${idsCL[Green]}${AD}'amps${spc}${idsCL[Green]}`IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'watts ${idsCL[Default]}"
DIVIDER . lightCyan ${PRI_WIDTH} DIVIDER . lightCyan ${PRI_WIDTH}
fi
if [ "${avgdays}" != "" ]; then if [ "${avgdays}" != "" ]; then
echo -en "${idsCL[Yellow]}Calculating Server Room Total Averages ... " echo -en "${idsCL[Yellow]}Calculating Server Room Total Averages ... "
SVRRM_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total']} ${avgdays} both) SVRRM_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total']} ${avgdays} both)
@@ -242,21 +239,17 @@ CHECKPOWER(){
SVRRM_WATT_WAC_avg=$(echo ${SVRRM_WAC_avg} | cut -d'~' -f 2) SVRRM_WATT_WAC_avg=$(echo ${SVRRM_WAC_avg} | cut -d'~' -f 2)
echo -en "\r\033[K" echo -en "\r\033[K"
fi fi
AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
echo -e "${idsCL[White]}Server Room ${idsCL[Default]}: ${idsCL[Green]}${AD}'amps${spc}${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'watts ${idsCL[Default]}"
AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP_WAC} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
echo -e "${idsCL[White]}Server Room w/AIR ${idsCL[Default]}: ${idsCL[Green]}${AD}'amps${spc}${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'watts ${idsCL[Default]}"
DIVIDER . lightCyan ${PRI_WIDTH}
fi
echo -e "${idsCL[White]}Server Room Voltage IN ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLTIN}'volts${idsCL[Default]}" echo -e "${idsCL[White]}Server Room Voltage IN ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLTIN}'volts${idsCL[Default]}"
echo -e "${idsCL[White]}Server Room Voltage OUT ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLTOUT}'volts${idsCL[Default]}" echo -e "${idsCL[White]}Server Room Voltage OUT ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_VOLTOUT}'volts${idsCL[Default]}"
[ ${REPORT} -eq 0 ] && echo -e "${idsCL[White]}Voltage Drop ${idsCL[Default]}: ${idsCL[LightRed]}${VOLT_DROP}'volts${idsCL[Default]}" [ ${REPORT} -eq 0 ] && echo -e "${idsCL[White]}Voltage Drop ${idsCL[Default]}: ${idsCL[LightRed]}${VOLT_DROP}'volts${idsCL[Default]}"
echo -en "${idsCL[White]}Server Room Amps ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'amps${idsCL[Default]}"
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${SVRRM_AMP_avg}`'amps${idsCL[Default]}" || echo -e "${idsCL[Default]}"
echo -en "${idsCL[LightCyan]} Total with AirCond ${idsCL[Default]}: ${idsCL[LightCyan]}${SVRRM_AMP_WAC}'amps"
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${SVRRM_AMP_WAC_avg}`'amps${idsCL[Default]}" || echo -e "${idsCL[Default]}"
echo -en "${idsCL[White]}Server Room Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'watts"
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 0`'watts${idsCL[Default]}" || echo -e "${idsCL[Default]}"
echo -en "${idsCL[LightCyan]} Total with AirCond ${idsCL[Default]}: ${idsCL[LightCyan]}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'watts"
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 0`'watts${idsCL[Default]}" || echo -e "${idsCL[Default]}"
[ ${REPORT} -eq 0 ] && echo [ ${REPORT} -eq 0 ] && echo
fi fi