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 10:30:59 -06:00
parent a8f8220ce3
commit 086a5c963b
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
inc/power.inc.sh
View File

@@ -315,13 +315,6 @@ CHECKPOWER(){
fi
[ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
if [ "${avgdays}" != "" ]; then
echo -en "${idsCL[Yellow]}Calculating Offsite Averages ... "
OFFSITE_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['offsite-ups']} ${avgdays} both)
OFFSITE_AMP_avg=$(echo ${OFFSITE_avg} | cut -d'~' -f 1)
OFFSITE_WATT_avg=$(echo ${OFFSITE_avg} | cut -d'~' -f 2)
echo -en "\r\033[K"
fi
echo -e "${idsCL[White]}UPS Voltage In ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_VOLTIN}`'volts${idsCL[Default]}"
echo -e "${idsCL[White]}UPS Voltage Out ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_VOLTOUT}`'volts${idsCL[Default]}"
@@ -330,8 +323,28 @@ CHECKPOWER(){
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]}"
[ ${REPORT} -eq 0 ] && echo
DIVIDER . lightCyan ${PRI_WIDTH}
[ "${avgdays}" != "" ] && echo -e " ${idsCL[LightYellow]}${avgdays_disp}-Averages"
echo -en "${idsCL[LightCyan]}Totals : Amps Watts"
[ "${avgdays}" != "" ] && echo -e " Amps Watts" || echo
AD=$(IDS_NUMBER_FORMAT ${OFFSITE_AMPS} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
echo -en "${idsCL[White]}Offsite Server Room ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_WATTS} 0`'W"
if [ "${avgdays}" != "" ]; then
echo -en "${idsCL[Yellow]} Calculating Offsite Server Room Total Averages ... "
OFFSITE_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['offsite-ups']} ${avgdays} both)
OFFSITE_AMP_avg=$(echo ${OFFSITE_avg} | cut -d'~' -f 1)
OFFSITE_WATT_avg=$(echo ${OFFSITE_avg} | cut -d'~' -f 2)
echo -en "\r\033[K"
echo -en "${idsCL[White]}Server Room w/AIR ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W"
AD=$(IDS_NUMBER_FORMAT ${OFFSITE_AMP_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
echo -e "${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_WATT_avg} 0`'W"
else
echo
fi
echo -en "${idsCL[White]}Total Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_AMPS}`'amps ${idsCL[Default]}~ est${idsCL[Green]}${idsCL[Default]}"
echo -en "${idsCL[White]}Total Amps ${idsCL[Default]}: ${idsCL[Green]}${AD}'amps ${idsCL[Default]}~ est${idsCL[Green]}${idsCL[Default]}"
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${OFFSITE_AMP_avg}`'amps" || echo -e "${idsCL[Default]}"
echo -en "${idsCL[White]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_WATTS} 0`'watts ${idsCL[Default]}~ est"
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${OFFSITE_WATT_avg} 0`'watts" || echo -e "${idsCL[Default]}\n"