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-02-11 13:16:42 -06:00
parent 1ab31943cd
commit a162bedb46
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
inc/power.inc.sh
View File

@@ -92,7 +92,7 @@ CHECKPOWER(){
[ ${REPORT} -eq 0 ] && echo [ ${REPORT} -eq 0 ] && echo
[ ${REPORT} -eq 0 ] && DIVIDER . yellow ${PRI_WIDTH} [ ${REPORT} -eq 0 ] && DIVIDER . yellow ${PRI_WIDTH}
echo -en "${idsCL[Yellow]}Mainsite Power Information" echo -en "${idsCL[Yellow]}Mainsite Power Information"
[ "${avgdays}" != "" ] && echo -e " ${idsCL[LightYellow]}${avgdays_disp}-Averages" || echo [ "${avgdays}" != "" ] && echo -e " --${idsCL[LightYellow]}${avgdays_disp}-Averages---" || echo
DIVIDER . yellow ${PRI_WIDTH} DIVIDER . yellow ${PRI_WIDTH}
[ ${REPORT} -eq 0 ] && echo -en "${idsCL[Yellow]}Pulling data from 'Powerwall' ... " [ ${REPORT} -eq 0 ] && echo -en "${idsCL[Yellow]}Pulling data from 'Powerwall' ... "

8
inc/temp.inc.sh
View File

@@ -251,7 +251,7 @@ CHECKTEMPSENSOR(){
echo ${mqtt_message} | cut -d':' -f 6 | cut -d',' -f 1 | read temp_c echo ${mqtt_message} | cut -d':' -f 6 | cut -d',' -f 1 | read temp_c
elif [ "${PW_SENSOR_TYPE[${1}]}" == "lacrosse" ]; then elif [ "${PW_SENSOR_TYPE[${1}]}" == "lacrosse" ]; then
if ! INFO=$(curl -m 7 -s --get -d "deviceid=${PW_SENSOR_DEVICEID[${SENSOR}]}" -d "limit=1" -d "metric=1" -d "timezone=2" https://decent-destiny-704.appspot.com/laxservices/device_info.php) ; then TIMEOUT=1; fi if ! INFO=$(curl -m 1 -s --get -d "deviceid=${PW_SENSOR_DEVICEID[${SENSOR}]}" -d "limit=1" -d "metric=1" -d "timezone=2" https://decent-destiny-704.appspot.com/laxservices/device_info.php) ; then TIMEOUT=1; fi
if [ "${INFO}" != "" ]; then if [ "${INFO}" != "" ]; then
if [[ "${1}" = *"-Probe" ]]; then if [[ "${1}" = *"-Probe" ]]; then
temp_c=`IDS_NUMBER_FORMAT $(echo ${INFO} | jq -r '.device0 .obs[].probe_temp') 2 yes` temp_c=`IDS_NUMBER_FORMAT $(echo ${INFO} | jq -r '.device0 .obs[].probe_temp') 2 yes`
@@ -350,7 +350,6 @@ CHECKTEMPSENSOR(){
lmd="Normal " lmd="Normal "
fi fi
echo -en "${lclr}${lmd}${spct}${temp_f_disp}${GAUGESH}" echo -en "${lclr}${lmd}${spct}${temp_f_disp}${GAUGESH}"
[ "${average}" != "" ] && echo -en " /${spca}${averagedisp}${GAUGESH}"
# if [ "${7}" == "fans" ]; then # if [ "${7}" == "fans" ]; then
# echo -en "${idsCL[Default]}${spc}[${idsCL[LightGreen]}${GL_LOW}${GAUGESH}${idsCL[Default]}/${idsCL[Green]}${ESXI_DEFAULT_EXHAUST_MIN}${GAUGESH}${idsCL[Default]}/${idsCL[LightYellow]}${GL_HIGH}${GAUGESH}${idsCL[Default]}]" # echo -en "${idsCL[Default]}${spc}[${idsCL[LightGreen]}${GL_LOW}${GAUGESH}${idsCL[Default]}/${idsCL[Green]}${ESXI_DEFAULT_EXHAUST_MIN}${GAUGESH}${idsCL[Default]}/${idsCL[LightYellow]}${GL_HIGH}${GAUGESH}${idsCL[Default]}]"
@@ -366,10 +365,11 @@ CHECKTEMPSENSOR(){
[ "${PW_SENSOR_TYPE[${1}]}" == "lacrosse" ] && [[ "${1}" != *"-ProbeXXX" ]] && echo -e " - $(echo ${INFO} | jq -r '.device0 .obs[].timestamp')" || echo [ "${PW_SENSOR_TYPE[${1}]}" == "lacrosse" ] && [[ "${1}" != *"-ProbeXXX" ]] && echo -e " - $(echo ${INFO} | jq -r '.device0 .obs[].timestamp')" || echo
fi fi
elif [ ${TIMEOUT} -eq 1 ]; then elif [ ${TIMEOUT} -eq 1 ]; then
echo -e "${idsCL[Yellow]}Sensor Timeout${idsCL[Default]}" echo -en "${idsCL[Yellow]}Sensor Timeout${idsCL[Default]}"
else else
echo -e "${idsCL[Yellow]}Sensor Offline${idsCL[Default]}" echo -en "${idsCL[Yellow]}Sensor Offline${idsCL[Default]}"
fi fi
[ "${average}" != "" ] && echo -en " /${spca}${averagedisp}${GAUGESH}"
} }
AVERAGETEMP(){ AVERAGETEMP(){
temptotal=0 temptotal=0