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
2025-07-19 09:38:13 -05:00
parent 558332d07e
commit 9ec6ea2bee
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

@@ -536,7 +536,7 @@ CHECKPOWER(){
echo -en "${idsCL[Default]}${AD1}${spc1}: ${idsCL[Green]}${AD2}'A${spc2}${AD3}'W" echo -en "${idsCL[Default]}${AD1}${spc1}: ${idsCL[Green]}${AD2}'A${spc2}${AD3}'W"
AD=$(IDS_NUMBER_FORMAT ${AMP_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done AD=$(IDS_NUMBER_FORMAT ${AMP_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
echo -e "${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${WATT_avg} 1 yes`'W" echo -e "${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${WATT_avg} 2 yes`'W"
fi fi
fi fi
done done
@@ -546,24 +546,24 @@ CHECKPOWER(){
echo -en "${idsCL[LightCyan]}Totals Amps Watts" echo -en "${idsCL[LightCyan]}Totals Amps Watts"
[ "${avgdays}" != "" ] && echo -e " Amps Watts" || echo -e " Volts" [ "${avgdays}" != "" ] && echo -e " Amps Watts" || echo -e " Volts"
if (( $(bc <<<"${OFFSITE_WATTS} < ${TOTAL_MISC_WATTS}") )); then if (( $(bc <<<"${OFFSITE_WATTS} < ${TOTAL_MISC_WATTS}") )); then
AW=${TOTAL_MISC_WATTS} AW=$(IDS_NUMBER_FORMAT ${TOTAL_MISC_WATTS} 2 yes)
AD=${TOTAL_MISC_AMPS} AD=${TOTAL_MISC_AMPS}
else else
AW=${OFFSITE_WATTS} AW=$(IDS_NUMBER_FORMAT ${OFFSITE_WATTS} 2 yes)
AD=${OFFSITE_AMPS} AD=${OFFSITE_AMPS}
fi fi
AD=$(IDS_NUMBER_FORMAT ${AD} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done AD=$(IDS_NUMBER_FORMAT ${AD} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
echo -en "${idsCL[White]}Offsite Equipment ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AW} 1 yes`'W" echo -en "${idsCL[White]}Offsite Equipment ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}{AW}'W"
if [ "${avgdays}" != "" ]; then if [ "${avgdays}" != "" ]; then
echo -en "${idsCL[Yellow]} Calculating Offsite Equipment Total Averages ... " echo -en "${idsCL[Yellow]} Calculating Offsite Equipment Total Averages ... "
OFFSITE_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['offsite-ups']} ${avgdays} both) OFFSITE_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['offsite-ups']} ${avgdays} both)
OFFSITE_AMP_avg=$(echo ${OFFSITE_avg} | cut -d'~' -f 1) OFFSITE_AMP_avg=$(echo ${OFFSITE_avg} | cut -d'~' -f 1)
OFFSITE_WATT_avg=$(echo ${OFFSITE_avg} | cut -d'~' -f 2) OFFSITE_WATT_avg=$(echo ${OFFSITE_avg} | cut -d'~' -f 2)
echo -en "\r\033[K" echo -en "\r\033[K"
echo -en "${idsCL[White]}Offsite Equipment ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AW} 1 yes`'W" echo -en "${idsCL[White]}Offsite Equipment ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}${AW}'W"
AD=$(IDS_NUMBER_FORMAT ${OFFSITE_AMP_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done AD=$(IDS_NUMBER_FORMAT ${OFFSITE_AMP_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
echo -e "${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_WATT_avg} 1 yes`'W" echo -e "${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_WATT_avg} 2 yes`'W"
else else
c=0; spc3=''; spca=`expr ${wspc} - ${#AW}`; until [ ${c} = ${spca} ]; do spc3="${spc3} "; ((c++)); done c=0; spc3=''; spca=`expr ${wspc} - ${#AW}`; until [ ${c} = ${spca} ]; do spc3="${spc3} "; ((c++)); done
echo -e "${spc3}${OFFSITE_VOLTS}'V${idsCL[Default]}" echo -e "${spc3}${OFFSITE_VOLTS}'V${idsCL[Default]}"