diff --git a/defaults.inc b/defaults.inc index cc6b392c..ed83db48 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.8.14-12012024' +VERS='2.8.15a-12182024' noheader=' update service dailytemp confsync -r -report test ' @@ -45,13 +45,8 @@ EMAIL_NOTICE=${PW_EMAIL_NOTICE} PUSHOVER_APP_TOKEN=${PW_PUSHOVER_APP_TOKEN} PUSHOVER_USER_TOKEN=${PW_PUSHOVER_USER_TOKEN} -if [ "${PW_FANINPUT}" == "" ]; then - if [ -f /sys/class/hwmon/hwmon2/fan1_input ]; then - PW_FANINPUT=/sys/class/hwmon/hwmon2/fan1_input - elif [ -f /sys/class/hwmon/hwmon3/fan1_input ]; then - PW_FANINPUT=/sys/class/hwmon/hwmon3/fan1_input - fi -fi + + [ "${PW_ENABLE_RENOTIFY}" == "" ] && PW_ENABLE_RENOTIFY=1 IFS=, diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index aeebda90..01cc5f5f 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -705,7 +705,14 @@ CHECKTEMPSENSOR(){ temp_c=${temp_c%\'*}; temp_c=${temp_c#*=} fi elif [[ "${1}" = *"FAN"* ]]; then - if ! temp_c=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${1}]} cat ${PW_FANINPUT}) ; then TIMEOUT=1; fi + # if [ "${1}" == "Powerwall-FAN" ]; then + if ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${1}]} [ -f /sys/class/hwmon/hwmon2/fan1_input ]; then + FANINPUT=/sys/class/hwmon/hwmon2/fan1_input + elif ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${1}]} [ -f /sys/class/hwmon/hwmon3/fan1_input ]; then + FANINPUT=/sys/class/hwmon/hwmon3/fan1_input + fi + # fi + if ! temp_c=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${1}]} cat ${FANINPUT}) ; then TIMEOUT=1; fi fi elif [ "${PW_SENSOR_TYPE[${1}]}" == "esxi" ]; then