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

update

Browse Source
This commit is contained in:
David Schroeder
2024-07-27 13:04:13 -05:00
parent 89ddafc3af
commit 4da8f6acb4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash
VERS='2.7.77-07272024'
VERS='2.7.80-07272024'
noheader=' update service dailytemp confsync -r -report test '

12
inc/power.inc.sh
View File

@@ -459,7 +459,7 @@ CHECKPOWER(){
[ "${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}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
HOST_WATTS_disp="${idsCL[Green]}`IDS_NUMBER_FORMAT ${AD} 1`'A${spc}`IDS_NUMBER_FORMAT ${HOST_WATTS} 0`'W"
HOST_WATTS_disp="${idsCL[Green]}`IDS_NUMBER_FORMAT ${AD} 1 true`'A${spc}`IDS_NUMBER_FORMAT ${HOST_WATTS} 0`'W"
elif [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSOR}]} -U ${PW_ESXI_USER} -P "${ESXI_PASS}" chassis power status | grep off)" != "" ]; then
HOST_WATTS_disp="${idsCL[LightRed]}Host powered down"
@@ -489,7 +489,7 @@ CHECKPOWER(){
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}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
average_disp=" ${AD}'A${spc}`IDS_NUMBER_FORMAT ${average_watt} 0`'W"
average_disp=" `IDS_NUMBER_FORMAT ${AD} 1 true`'A${spc}`IDS_NUMBER_FORMAT ${average_watt} 0`'W"
echo -en "\r\033[K"
echo -e "${MSG}${idsCL[LightYellow]}${average_disp}${idsCL[Default]}"
@@ -506,8 +506,8 @@ CHECKPOWER(){
if [ ${HOST_WATTS} -gt 0 ]; then
DIVIDER . darkGray ${PRI_WIDTH}
echo -e " PS1 : ${idsCL[Green]}`IDS_NUMBER_FORMAT ${PS1} 1`'amps ${idsCL[Default]}@${idsCL[LightCyan]} ${PS1V}'volts${idsCL[Default]}"
echo -e " PS2 : ${idsCL[Green]}`IDS_NUMBER_FORMAT ${PS2} 1`'amps ${idsCL[Default]}@${idsCL[LightCyan]} ${PS2V}'volts${idsCL[Default]}"
echo -e " PS1 : ${idsCL[Green]}`IDS_NUMBER_FORMAT ${PS1} 1 true`'amps ${idsCL[Default]}@${idsCL[LightCyan]} ${PS1V}'volts${idsCL[Default]}"
echo -e " PS2 : ${idsCL[Green]}`IDS_NUMBER_FORMAT ${PS2} 1 true`'amps ${idsCL[Default]}@${idsCL[LightCyan]} ${PS2V}'volts${idsCL[Default]}"
fi
[ "${SENSOR}" != "OFF-vMS-Host1" ] && DIVIDER . lightCyan ${PRI_WIDTH}
@@ -531,13 +531,13 @@ CHECKPOWER(){
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}'A${spc}`IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_MAINSITE} 0`'W "
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
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${AD} 1 true`'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}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
echo -en "${idsCL[LightCyan]}Offsite ESXi Total ${idsCL[Default]}: ${idsCL[LightGreen]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_OFFSITE} 0`'W "
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
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${AD} 1 true`'A${spc}`IDS_NUMBER_FORMAT ${AVERAGE_WATTS_OFFSITE} 0`'W" || echo
fi
fi
if [ ${REPORT} -eq 0 ]; then