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-11-10 09:00:42 -06:00
parent e0efcdc5ad
commit f46431c8f2
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
defaults.inc
View File

@@ -30,11 +30,9 @@ source ${PW_FOLDER}/conf/settings.conf
IP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1) IP=$(ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | head -n 1 | awk '/inet/ {print $2}' | cut -d'/' -f1)
if [[ "${IP}" = "10.2.1."* ]]; then if [[ "${IP}" = "10.2.1."* ]]; then
loo=local
mqtt_conn="/usr/bin/mosquitto_sub -h ${PW_IP} -u ${PW_MQTT_USER} -P ${PW_MQTT_PASS}" mqtt_conn="/usr/bin/mosquitto_sub -h ${PW_IP} -u ${PW_MQTT_USER} -P ${PW_MQTT_PASS}"
mysql_conn="/usr/bin/mysql -h ${PW_MYSQL_HOST} --user=${PW_MYSQL_USER} --password=${PW_MYSQL_PASS}" mysql_conn="/usr/bin/mysql -h ${PW_MYSQL_HOST} --user=${PW_MYSQL_USER} --password=${PW_MYSQL_PASS}"
else else
loo=local
mqtt_conn="/usr/bin/mosquitto_sub -h 127.0.0.1 -u ${PW_MQTT_USER} -P ${PW_MQTT_PASS}" mqtt_conn="/usr/bin/mosquitto_sub -h 127.0.0.1 -u ${PW_MQTT_USER} -P ${PW_MQTT_PASS}"
mysql_conn='/usr/bin/mysql' mysql_conn='/usr/bin/mysql'
fi fi
@@ -85,7 +83,7 @@ if [ -f ${PW_FOLDER}/conf/settings.${loo}.conf ]; then
declare -A PW_MISCSENSOR_DESC declare -A PW_MISCSENSOR_DESC
declare -A PW_DESC_TEMP declare -A PW_DESC_TEMP
source ${PW_FOLDER}/conf/settings.${loo}.conf source ${PW_FOLDER}/conf/settings.local.conf
[ "${PW_TEMPIND_DIFF}" == "" ] && PW_TEMPIND_DIFF=1 [ "${PW_TEMPIND_DIFF}" == "" ] && PW_TEMPIND_DIFF=1

1
inc/temp.inc.sh
View File

@@ -367,6 +367,7 @@ CHECKTEMP(){
fi fi
DIVIDER . yellow ${PRI_WIDTH} DIVIDER . yellow ${PRI_WIDTH}
for SENSOR in ${PW_SENSOR_ORD[@]}; do for SENSOR in ${PW_SENSOR_ORD[@]}; do
echo $SENSOR
if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "esxi" ] && ([ "${exclude}" == "" ] || [[ ! "${SENSOR,,}" = *"${exclude,,}"* ]]) && ([ "${search}" == "" ] || [[ "${SENSOR,,}" = *"${search,,}"* ]] || [[ "${PW_DESC_TEMP[${SENSOR}],,}" = *"${search,,}"* ]]) && ([ "${STYPE}" = "" ] || ([ "${STYPE}" = "mainsite" ] && [[ "${PW_HOST_ADDRESSES[${SENSOR}]}" = *"10.10."* ]]) || ([ "${STYPE}" = "offsite" ] && [[ "${PW_HOST_ADDRESSES[${SENSOR}]}" = *"10.2.1."* ]]) ); then if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "esxi" ] && ([ "${exclude}" == "" ] || [[ ! "${SENSOR,,}" = *"${exclude,,}"* ]]) && ([ "${search}" == "" ] || [[ "${SENSOR,,}" = *"${search,,}"* ]] || [[ "${PW_DESC_TEMP[${SENSOR}],,}" = *"${search,,}"* ]]) && ([ "${STYPE}" = "" ] || ([ "${STYPE}" = "mainsite" ] && [[ "${PW_HOST_ADDRESSES[${SENSOR}]}" = *"10.10."* ]]) || ([ "${STYPE}" = "offsite" ] && [[ "${PW_HOST_ADDRESSES[${SENSOR}]}" = *"10.2.1."* ]]) ); then
vHOSTiDRACIP=${PW_HOST_IDRACS[${SENSOR}]} vHOSTiDRACIP=${PW_HOST_IDRACS[${SENSOR}]}
vHOSTIP=${PW_HOST_ADDRESSES[${SENSOR}]} vHOSTIP=${PW_HOST_ADDRESSES[${SENSOR}]}