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 11:55:20 -06:00
parent cccd4f26cb
commit 90d663012f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
inc/power.inc.sh
View File

@@ -401,7 +401,7 @@ CHECKPOWER(){
[ "${PS1}" != "0.0" ] && PS1=`echo "scale=1; ${PS1}/10" | bc` && (( $(bc <<<"${PS1} < 1") )) && [[ "${PS1}" = *"."* ]] && PS1="0${PS1}"
[ "${PS2}" != "0.0" ] && PS2=`echo "scale=1; ${PS2}/10" | bc` && (( $(bc <<<"${PS2} < 1") )) && [[ "${PS2}" = *"."* ]] && PS2="0${PS2}"
HOST_AMPS=`echo "scale=1; ${PS1}+${PS2}" | bc`
AD=${HOST_AMPS}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD} - 2`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
AD=${HOST_AMPS}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
HOST_WATTS_disp="${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${HOST_WATTS} 0`'W"
elif [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSOR}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power status | grep off)" != "" ]; then
@@ -430,7 +430,7 @@ CHECKPOWER(){
average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays} both)
average_amp=$(echo ${average} | cut -d'~' -f 1)
average_watt=$(echo ${average} | cut -d'~' -f 2)
AD=${average_amp}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD} - 2`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
AD=${average_amp}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
average_disp=" ${AD}'A${spc}`IDS_NUMBER_FORMAT ${average_watt} 0`'W"
echo -en "\r\033[K"
echo -e "${MSG}${idsCL[LightYellow]}${average_disp}${idsCL[Default]}"
@@ -467,15 +467,15 @@ CHECKPOWER(){
done
DIVIDER . lightCyan ${PRI_WIDTH}
if [ "${STYPE}" = "" ] || [ "${STYPE}" = "mainsite" ]; then
AD=${SENSOR_TOTAL_AMPS_MAINSITE}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD} - 2`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
AD=${SENSOR_TOTAL_AMPS_MAINSITE}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
echo -en "${idsCL[LightCyan]}Mainsite ESXi Total ${idsCL[Default]}: ${idsCL[LightGreen]}${AD}'amps${spc}`IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_MAINSITE} 0`'watts "
AD=${AVERAGE_AMPS_MAINSITE}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD} - 2`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
AD=${AVERAGE_AMPS_MAINSITE}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${AVERAGE_WATTS_MAINSITE} 0`'W" || echo
fi
if [ "${STYPE}" = "" ] || [ "${STYPE}" = "offsite" ]; then
AD=${SENSOR_TOTAL_AMPS_OFFSITE}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD} - 2`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
AD=${SENSOR_TOTAL_AMPS_OFFSITE}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
echo -en "${idsCL[LightCyan]}Offsite ESXi Total ${idsCL[Default]}: ${idsCL[LightGreen]}${AD}'amps${spc}`IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_OFFSITE} 0`'W "
AD=${AVERAGE_AMPS_OFFSITE}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD} - 2`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
AD=${AVERAGE_AMPS_OFFSITE}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${AVERAGE_WATTS_OFFSITE} 0`'W" || echo
fi
fi