Update powerwall.sh

This commit is contained in:
2023-10-31 09:24:15 -05:00
parent 2464fea486
commit 062bb6ab93

View File

@@ -516,6 +516,17 @@ GETHOSTPOWER(){
fi
echo ${temp} >| ${PW_TMPFOLDER}/${1}.hostpower
}
check_GETHOSTPOWER(){
for SENSOR in ${PW_SENSOR_ORD[@]}; do
if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then
checked=""
until [ "${checked}" != "" ]; do
[ -f ${PW_TMPFOLDER}/${PW_HOST_IDRACS[${SENSOR}]}.hostpower ] && checked=good
done
fi
done
touch ${PW_TMPFOLDER}/done.hostpower
}
CHECKPOWER(){
@@ -524,6 +535,7 @@ CHECKPOWER(){
GETHOSTPOWER ${PW_HOST_IDRACS[${SENSOR}]} &
fi
done
check_GETHOSTPOWER &
INVSTATSINFO=$(curl -s "https://inv1.scity.us/stats.json")
INPUTV=`echo ${INVSTATSINFO} | jq '.inputs .inV'`
@@ -568,15 +580,28 @@ CHECKPOWER(){
echo -e "${idsCL[LightCyan]}Total Amps ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}A${idsCL[Default]}"
echo -e "${idsCL[LightCyan]}Total Wattage ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_WATT}W${idsCL[Default]}"
echo
for SENSOR in ${PW_SENSOR_ORD[@]}; do
if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then
checked=""
until [ "${checked}" != "" ]; do
[ -f ${PW_TMPFOLDER}/${PW_HOST_IDRACS[${SENSOR}]}.hostpower ] && checked=good
done
watts=$(cat ${PW_TMPFOLDER}/${PW_HOST_IDRACS[${SENSOR}]}.hostpower)
echo -e "${idsCL[LightCyan]}HOST '${PW_iDRACHOST_SHORTNAMES[${PW_HOST_IDRACS[${SENSOR}]}]}' ${idsCL[Default]}: ${idsCL[Green]}${watts}W${idsCL[Default]}"
rm -f ${PW_TMPFOLDER}/${PW_HOST_IDRACS[${SENSOR}]}.hostpower
# for SENSOR in ${PW_SENSOR_ORD[@]}; do
# if [ "${PW_HOST_IDRACS[${SENSOR}]}" != "" ]; then
# checked=""
# until [ "${checked}" != "" ]; do
# [ -f ${PW_TMPFOLDER}/${PW_HOST_IDRACS[${SENSOR}]}.hostpower ] && checked=good
# done
# watts=$(cat ${PW_TMPFOLDER}/${PW_HOST_IDRACS[${SENSOR}]}.hostpower)
# echo -e "${idsCL[LightCyan]}HOST '${PW_iDRACHOST_SHORTNAMES[${PW_HOST_IDRACS[${SENSOR}]}]}' ${idsCL[Default]}: ${idsCL[Green]}${watts}W${idsCL[Default]}"
# rm -f ${PW_TMPFOLDER}/${PW_HOST_IDRACS[${SENSOR}]}.hostpower
# fi
# done
until [ "${checked}" != "" ]; do
for hostfile in ${PW_TMPFOLDER}/*.hostpower; do
host=${hostfile%.*}; host=${host##*/}
watts=$(cat ${hostfile})
echo -e "${idsCL[LightCyan]}HOST '${PW_iDRACHOST_SHORTNAMES[${host}]}' ${idsCL[Default]}: ${idsCL[Green]}${watts}W${idsCL[Default]}"
rm -f ${hostfile}
done
if [ -f ${PW_TMPFOLDER}/done.hostpower ]; then
checked=done
rm -f ${PW_TMPFOLDER}/done.hostpower
fi
done