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-01-08 22:58:56 -06:00
parent 1763f14bd8
commit 547d1b6b40
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,5 +1,5 @@
VERS='2.5.109-01072024' VERS='2.5.110-01082024'
noheader=' update service dailytemp confsync -r -report ' noheader=' update service dailytemp confsync -r -report '

28
inc/power.inc.sh
View File

@@ -311,25 +311,25 @@ CHECKPOWER(){
MSG="${idsCL[White]}${SENSOR} ${idsCL[Default]}: ${HOST_WATTS_disp}" MSG="${idsCL[White]}${SENSOR} ${idsCL[Default]}: ${HOST_WATTS_disp}"
[ ${REPORT} -eq 0 ] && echo -en "\r\033[K" [ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
echo -en "${MSG}" echo -en "${MSG}"
if [ "${HOST_WATT_SENSORS}" != "" ] && [ ${HOST_WATTS} -gt 0 ]; then
if [ "${HOST_WATT_SENSORS}" != "" ]; then if [ "${avgdays}" != "" ]; then
if [ "${avgdays}" != "" ] && [ ${HOST_WATTS} -gt 0 ]; then
echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}" echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}"
average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts" average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays}); average_disp="${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${average}`'watts"
echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}" echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}"
elif [ ${HOST_WATTS} -gt 0 ]; then else
echo -en "${idsCL[Cyan]} [PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]" if [ "${PW_HOST_IDRACS[${SENSOR}]}" == "10.2.1.21" ]; then
fi # vHOSTFAN=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSOR}]} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq)
if [ "${PW_HOST_IDRACS[${SENSOR}]}" == "10.2.1.21" ] && [ ${HOST_WATTS} -ge 0 ]; then # FanSpeed=$(ROUND_NUMBER `echo "scale=0; $(ROUND_NUMBER `echo "scale=4; ${vHOSTFAN}/21200" | bc` 2)*100/1" | bc` 0)
# vHOSTFAN=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSOR}]} .1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.3 -O vq) echo -en "${idsCL[LightCyan]} Getting FanSpeed..."
# FanSpeed=$(ROUND_NUMBER `echo "scale=0; $(ROUND_NUMBER `echo "scale=4; ${vHOSTFAN}/21200" | bc` 2)*100/1" | bc` 0) until [ -f ${PW_TMPFOLDER}/.fanspeed ]; do tmp=tmp; done
echo -en "${idsCL[LightCyan]} Getting FanSpeed..." echo -en "\r\033[K${MSG}${idsCL[Cyan]} [PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]${idsCL[LightCyan]} [FanSpeed=$(cat ${PW_TMPFOLDER}/.fanspeed)'%]"
until [ -f ${PW_TMPFOLDER}/.fanspeed ]; do tmp=tmp; done rm -f ${PW_TMPFOLDER}/.fanspeed
echo -en "\r\033[K${MSG}${idsCL[Cyan]} [PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]${idsCL[LightCyan]} [FanSpeed=$(cat ${PW_TMPFOLDER}/.fanspeed)'%]"
rm -f ${PW_TMPFOLDER}/.fanspeed else
echo -en "${idsCL[Cyan]} [PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]"
fi
fi fi
fi fi
echo -e "${idsCL[Default]}" echo -e "${idsCL[Default]}"
fi fi
fi fi