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 17:50:19 -06:00
parent c4c070917a
commit 1064f7962b
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
inc/power.inc.sh
View File

@@ -320,11 +320,17 @@ CHECKPOWER(){
OFFSITE_FIREWALL_AMP=$(ROUND_NUMBER $(echo "scale=3; ${OFFSITE_FIREWALL_AMP}/1000" | bc -l) 2)
OFFSITE_FIREWALL_WATT=$(echo "${OFFSITE_FIREWALL_INFO}" | grep '"19":' | cut -d' ' -f 4 | sed 's/,//g')
OFFSITE_FIREWALL_WATT=$(echo "scale=1; ${OFFSITE_FIREWALL_WATT}/10" | bc -l)
OFFSITE_FIREWALL_VOLT=$(echo "${OFFSITE_FIREWALL_INFO}" | grep '"20":' | cut -d' ' -f 4 | sed 's/,//g')
OFFSITE_FIREWALL_VOLT=$(echo "scale=1; ${OFFSITE_FIREWALL_VOLT}/10" | bc -l)
OFFSITE_WIFI_INFO=$(curl -m 3 -s http://${PW_TUYA_API}/status/${PW_SENSOR_DEVICEID['offsite-wifi']} | jq '.dps')
OFFSITE_WIFI_AMP=$(echo "${OFFSITE_WIFI_INFO}" | grep '"4":' | cut -d' ' -f 4 | sed 's/,//g')
OFFSITE_WIFI_AMP=$(ROUND_NUMBER $(echo "scale=3; ${OFFSITE_WIFI_AMP}/1000" | bc -l) 2)
OFFSITE_WIFI_WATT=$(echo "${OFFSITE_WIFI_INFO}" | grep '"5":' | cut -d' ' -f 4 | sed 's/,//g')
OFFSITE_WIFI_WATT=$(echo "scale=1; ${OFFSITE_WIFI_WATT}/10" | bc -l)
OFFSITE_WIFI_VOLT=$(echo "${OFFSITE_WIFI_INFO}" | grep '"6":' | cut -d' ' -f 4 | sed 's/,//g')
OFFSITE_WIFI_VOLT=$(echo "scale=1; ${OFFSITE_WIFI_VOLT}/10" | bc -l)
fi
[ ${REPORT} -eq 0 ] && echo -en "\r\033[K"
@@ -339,12 +345,14 @@ CHECKPOWER(){
echo -e "${idsCL[White]}UPS Battery Runtime ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_RUNTIME}'Mins${idsCL[Default]}"
echo -e "${idsCL[White]}UPS Battery Voltage ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_BATT_VOLT}'volts${idsCL[Default]}"
[ ${REPORT} -eq 0 ] && echo
echo -en "${idsCL[LightCyan]}Misc Sensors Amps Watts"
echo -en "${idsCL[LightCyan]}Misc Sensors Amps Watts Volts"
[ "${avgdays}" != "" ] && echo -e " Amps Watts" || echo
AD=$(IDS_NUMBER_FORMAT ${OFFSITE_FIREWALL_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
echo -e "${idsCL[White]}Firewall Power Usage ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_FIREWALL_WATT} 0`'W"
AD=$(IDS_NUMBER_FORMAT ${OFFSITE_WIFI_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
echo -e "${idsCL[White]}WiFi Power Usage ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${OFFSITE_WIFI_WATT} 0`'W"
AD1=$(IDS_NUMBER_FORMAT ${OFFSITE_FIREWALL_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD1}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
AD2=$(IDS_NUMBER_FORMAT ${OFFSITE_FIREWALL_WATT} 2 yes); c=0; spc2=''; spc1=`expr ${wspc} - ${#AD2}`; until [ ${c} = ${spc1} ]; do spc2="${spc2} "; ((c++)); done
echo -e "${idsCL[White]}Firewall Power Usage ${idsCL[Default]}: ${idsCL[Green]}${AD1}'A${spc}${AD2}'W${spc2}${OFFSITE_FIREWALL_VOLT}'V"
AD1=$(IDS_NUMBER_FORMAT ${OFFSITE_WIFI_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD1}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
AD2=$(IDS_NUMBER_FORMAT ${OFFSITE_WIFI_WATT} 2 yes); c=0; spc2=''; spc1=`expr ${wspc} - ${#AD2}`; until [ ${c} = ${spc1} ]; do spc2="${spc2} "; ((c++)); done
echo -e "${idsCL[White]}WiFi Power Usage ${idsCL[Default]}: ${idsCL[Green]}${AD1}'A${spc}${AD2}'W${spc2}${OFFSITE_WIFI_VOLT}'V"
DIVIDER . lightCyan ${PRI_WIDTH}
[ "${avgdays}" != "" ] && echo -e " --${idsCL[LightYellow]}${avgdays_disp}-Averages---"