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-12 08:09:29 -06:00
parent 10d2d74dd6
commit bfb69be476
2 changed files with 18 additions and 3 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.132-01112024' VERS='2.5.133-01122024'
noheader=' update service dailytemp confsync -r -report ' noheader=' update service dailytemp confsync -r -report '

19
inc/power.inc.sh
View File

@@ -252,6 +252,10 @@ CHECKPOWER(){
SENSOR_TOTAL_AMPS_MAINSITE=0 SENSOR_TOTAL_AMPS_MAINSITE=0
SENSOR_TOTAL_WATTS_OFFSITE=0 SENSOR_TOTAL_WATTS_OFFSITE=0
SENSOR_TOTAL_AMPS_OFFSITE=0 SENSOR_TOTAL_AMPS_OFFSITE=0
if [ "${avgdays}" != "" ]; then
AVERAGE_WATTS_MAINSITE=0
AVERAGE_WATTS_OFFSITE=0
fi
for SENSOR in ${PW_SENSOR_ORD[@]}; do for SENSOR in ${PW_SENSOR_ORD[@]}; do
if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then
if [ "${STYPE}" == "" ] || ([ "${STYPE}" == "mainsite" ] && [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.10."* ]]) || ([ "${STYPE}" == "offsite" ] && [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.2.1."* ]]); then if [ "${STYPE}" == "" ] || ([ "${STYPE}" == "mainsite" ] && [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.10."* ]]) || ([ "${STYPE}" == "offsite" ] && [[ "${PW_HOST_IDRACS[${SENSOR}]}" = *"10.2.1."* ]]); then
@@ -315,6 +319,11 @@ CHECKPOWER(){
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}"
if [[ "${PW_MAINSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]]; then
AVERAGE_WATTS_MAINSITE=$(expr ${AVERAGE_WATTS_MAINSITE} + ${average})
else
AVERAGE_WATTS_OFFSITE=$(expr ${AVERAGE_WATTS_OFFSITE} + ${average})
fi
else else
echo -en "${idsCL[Cyan]} [PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]" echo -en "${idsCL[Cyan]} [PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]"
fi fi
@@ -324,8 +333,14 @@ CHECKPOWER(){
fi fi
done done
DIVIDER . lightCyan 75 DIVIDER . lightCyan 75
[ "${STYPE}" == "" ] || [ "${STYPE}" == "mainsite" ] && echo -e "${idsCL[LightCyan]}Mainsite Total ${idsCL[Default]}: ${idsCL[LightGreen]}${SENSOR_TOTAL_AMPS_MAINSITE}'amps - `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_MAINSITE}`'watts" if [ "${STYPE}" == "" ] || [ "${STYPE}" == "mainsite" ]; then
[ "${STYPE}" == "" ] || [ "${STYPE}" == "offsite" ] && echo -e "${idsCL[LightCyan]}Offsite Total ${idsCL[Default]}: ${idsCL[LightGreen]}${SENSOR_TOTAL_AMPS_OFFSITE}'amps - `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_OFFSITE}`'watts" echo -en "${idsCL[LightCyan]}Mainsite Total ${idsCL[Default]}: ${idsCL[LightGreen]}${SENSOR_TOTAL_AMPS_MAINSITE}'amps - `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_MAINSITE}`'watts"
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${AVERAGE_WATTS_MAINSITE}`'watts" || echo
fi
if [ "${STYPE}" == "" ] || [ "${STYPE}" == "offsite" ]; then
echo -e "${idsCL[LightCyan]}Offsite Total ${idsCL[Default]}: ${idsCL[LightGreen]}${SENSOR_TOTAL_AMPS_OFFSITE}'amps - `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_OFFSITE}`'watts"
[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${AVERAGE_WATTS_OFFSITE}`'watts" || echo
fi
fi fi
if [ ${REPORT} -eq 0 ]; then if [ ${REPORT} -eq 0 ]; then
end=`date +%s`; runtime=$((end-start)); echo -e "\n${idsCL[Default]}runtime: ${runtime}s" end=`date +%s`; runtime=$((end-start)); echo -e "\n${idsCL[Default]}runtime: ${runtime}s"