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:02:45 -06:00
parent 78fff56141
commit 314963970e
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
inc/power.inc.sh
View File

@@ -432,28 +432,28 @@ CHECKPOWER(){
SENSOR_TOTAL_AMPS_OFFSITE=$(echo "scale=1; ${SENSOR_TOTAL_AMPS_OFFSITE}+${HOST_AMPS}" | bc)
fi
fi
# if [ ${HOST_WATTS} -gt 0 ]; then
if [ "${avgdays}" != "" ] && [ ${HOST_WATTS} -ne -2 ] && [ "${SENSOR}" != "iDS-vMS-Host6" ]; then
echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}"
# AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays} both
average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays} both)
average_amp=$(echo ${average} | cut -d'~' -f 1)
average_watt=$(echo ${average} | cut -d'~' -f 2)
average_disp="${idsCL[LightYellow]} ${average_amp}'amps - `IDS_NUMBER_FORMAT ${average_watt} 0`'watts"
echo -e "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}"
if [[ "${PW_MAINSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]]; then
AVERAGE_WATTS_MAINSITE=`echo "scale=2; ${AVERAGE_WATTS_MAINSITE}+${average_watt}" | bc`
AVERAGE_AMPS_MAINSITE=`echo "scale=2; ${AVERAGE_AMPS_MAINSITE}+${average_amp}" | bc`
else
AVERAGE_WATTS_OFFSITE=`echo "scale=2; ${AVERAGE_WATTS_OFFSITE}+${average_watt}" | bc`
AVERAGE_AMPS_OFFSITE=`echo "scale=2; ${AVERAGE_AMPS_OFFSITE}+${average_amp}" | bc`
fi
if [ "${avgdays}" != "" ] && [ ${HOST_WATTS} -ne -2 ] && [ "${SENSOR}" != "iDS-vMS-Host6" ]; then
echo -en "${idsCL[LightYellow]} Calculating average ...${idsCL[Default]}"
# AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays} both
average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays} both)
average_amp=$(echo ${average} | cut -d'~' -f 1)
average_watt=$(echo ${average} | cut -d'~' -f 2)
average_disp="${idsCL[LightYellow]} ${average_amp}'amps - `IDS_NUMBER_FORMAT ${average_watt} 0`'watts"
echo -e "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}"
if [[ "${PW_MAINSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]]; then
AVERAGE_WATTS_MAINSITE=`echo "scale=2; ${AVERAGE_WATTS_MAINSITE}+${average_watt}" | bc`
AVERAGE_AMPS_MAINSITE=`echo "scale=2; ${AVERAGE_AMPS_MAINSITE}+${average_amp}" | bc`
else
AVERAGE_WATTS_OFFSITE=`echo "scale=2; ${AVERAGE_WATTS_OFFSITE}+${average_watt}" | bc`
AVERAGE_AMPS_OFFSITE=`echo "scale=2; ${AVERAGE_AMPS_OFFSITE}+${average_amp}" | bc`
fi
fi
if [ ${HOST_WATTS} -gt 0 ]; then
echo -e "${idsCL[White]} Power Supply 1 : ${idsCL[Default]}: ${idsCL[LightCyan]}${PS1}'A-${PS1V}'V"
echo -e "${idsCL[White]} Power Supply 2 : ${idsCL[Default]}: ${idsCL[LightCyan]}${PS2}'A-${PS2V}'V"
fi
# fi
echo -e "${idsCL[Default]}"
fi
fi