From 41f5f44851fcabc07d64926d52f120f3152e4fc3 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 28 Oct 2024 22:17:27 -0500
Subject: [PATCH] update

---
 defaults.inc    | 10 ++++++++--
 inc/temp.inc.sh | 10 +++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index c268ec49..1e231674 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='2.7.117-10282024'
+VERS='2.7.118-10282024'
 
 noheader=' update service dailytemp confsync -r -report test '
 
@@ -32,7 +32,13 @@ EMAIL_NOTICE=${PW_EMAIL_NOTICE}
 PUSHOVER_APP_TOKEN=${PW_PUSHOVER_APP_TOKEN}
 PUSHOVER_USER_TOKEN=${PW_PUSHOVER_USER_TOKEN}
 
-[ "${PW_FANINPUT}" == "" ] && PW_FANINPUT=/sys/class/hwmon/hwmon2/fan1_input
+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
 
 mqtt_conn="/usr/bin/mosquitto_sub -h 127.0.0.1 -u ${PW_MQTT_USER} -P ${PW_MQTT_PASS}"
diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 74bdc799..288300ca 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -20,12 +20,16 @@ START_POWERWALL_FAN(){
 		temp_c=$(cat ${PW_FANINPUT})
 		if [ ${temp_c} -gt 0 ]; then
 			fs=$(IDS_NUMBER_FORMAT ${temp_c})
-			SENDNOTICE "Starting up the ${SENSOR}" "Startup confirmed, the fan is now reading: ${fs}'RPM"
+			SENDNOTICE "Starting up the ${SENSOR}" "Startup confirmed, the fan is now reading: ${fs}'RPM
+
+FAN: ${PW_FANINPUT}"
 		else
-			SENDNOTICE "FAILED to start ${SENSOR}" "Cannot start the fan, ERROR WILL ROBINSON!!!" 1
+			SENDNOTICE "FAILED to start ${SENSOR}" "Cannot start the fan, ERROR WILL ROBINSON!!!
+
+FAN: ${PW_FANINPUT}" 1
 		fi
 	else
-		SENDNOTICE "FAILED to start ${SENSOR}" "Cannot find hardware (${PW_FANINPUT}), ERROR ERROR ERROR... DOES NOT COMPUTE... YOU SUCK" 1
+		SENDNOTICE "FAILED to start ${SENSOR}" "Cannot find hardware, ERROR ERROR ERROR... DOES NOT COMPUTE... YOU SUCK" 1
 	fi
 }
 CHECKTEMP(){