diff --git a/defaults.inc b/defaults.inc index cacc9e7e..29234f3f 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.7.87-08212024' +VERS='2.7.88-08212024' noheader=' update service dailytemp confsync -r -report test ' @@ -31,6 +31,7 @@ EMAIL_NOTICE=${PW_EMAIL_NOTICE} PUSHOVER_APP_TOKEN=${PW_PUSHOVER_APP_TOKEN} PUSHOVER_USER_TOKEN=${PW_PUSHOVER_USER_TOKEN} +PW_FANINPUT=/sys/class/hwmon/hwmon3/fan1_input mqtt_conn="/usr/bin/mosquitto_sub -h 127.0.0.1 -u ${PW_MQTT_USER} -P ${PW_MQTT_PASS}" # mysql_conn="/usr/bin/mysql -h ${PW_MYSQL_HOST} -P 6033 --user=${PW_MYSQL_USER} --password=${PW_MYSQL_PASS}" diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index fe5fa7bf..339e77b9 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -16,7 +16,7 @@ START_POWERWALL_FAN(){ pwmconfig & sleep 4s killall pwmconfig - temp_c=$(cat /sys/class/hwmon/hwmon2/fan1_input) + temp_c=$(cat ${PW_FANINPUT}) if [ ${temp_c} -gt 0 ]; then SENDNOTICE "Starting up the ${SENSOR}" "Startup confirmed, the fan is now reading: ${temp_c}" else @@ -680,7 +680,7 @@ CHECKTEMPSENSOR(){ temp_c=$(vcgencmd measure_temp) temp_c=${temp_c%\'*}; temp_c=${temp_c#*=} elif [[ "${1}" = *"FAN"* ]]; then - temp_c=$(cat /sys/class/hwmon/hwmon2/fan1_input) + temp_c=$(cat ${PW_FANINPUT}) fi elif [ "${PW_SENSOR_TYPE[${1}]}" == "remotesystem" ]; then if ! temp_c=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${1}]} vcgencmd measure_temp) ; then TIMEOUT=1; fi @@ -942,7 +942,7 @@ CHECKTEMP_SERVICE_RUNSENSOR(){ temp_c=${temp_c%\'*}; temp_c=${temp_c#*=} temp_h='' elif [[ "${SENSOR}" = *"FAN"* ]]; then - temp_c=$(cat /sys/class/hwmon/hwmon2/fan1_input) + temp_c=$(cat ${PW_FANINPUT}) temp_h='' if [ "${SENSOR}" == "Powerwall-FAN" ] && [ ${temp_c} -lt 1500 ]; then START_POWERWALL_FAN >/dev/null 2>&1 & @@ -1552,7 +1552,7 @@ SENDTEMP(){ temp_c=$(vcgencmd measure_temp) temp_c=${temp_c%\'*}; temp_c=${temp_c#*=} elif [[ "${SENSORa}" = *"FAN"* ]]; then - temp_c=$(cat /sys/class/hwmon/hwmon2/fan1_input) + temp_c=$(cat ${PW_FANINPUT}) fi elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "remotesystem" ]; then temp_c=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${SENSORa}]} vcgencmd measure_temp)