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-12-19 17:38:13 -06:00
parent 0732d1fd25
commit 2c6f5794e5
2 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='2.8.15c-12182024' VERS='2.8.16-12192024'
noheader=' update service dailytemp confsync -r -report test ' noheader=' update service dailytemp confsync -r -report test '
@@ -45,9 +45,8 @@ EMAIL_NOTICE=${PW_EMAIL_NOTICE}
PUSHOVER_APP_TOKEN=${PW_PUSHOVER_APP_TOKEN} PUSHOVER_APP_TOKEN=${PW_PUSHOVER_APP_TOKEN}
PUSHOVER_USER_TOKEN=${PW_PUSHOVER_USER_TOKEN} PUSHOVER_USER_TOKEN=${PW_PUSHOVER_USER_TOKEN}
[ "${PW_ENABLE_RENOTIFY}" == "" ] && PW_ENABLE_RENOTIFY=1 [ "${PW_ENABLE_RENOTIFY}" == "" ] && PW_ENABLE_RENOTIFY=1
[ "${PW_FANINPUT}" == "" ] && PW_FANINPUT="/sys/class/hwmon/*/fan1_input"
IFS=, IFS=,
PW_MAINSITEHOSTS=(${PW_MAINSITE_HOSTS}) PW_MAINSITEHOSTS=(${PW_MAINSITE_HOSTS})

33
inc/temp.inc.sh
View File

@@ -14,25 +14,20 @@ GET_HOST_FANSPEED(){
} }
START_POWERWALL_FAN(){ START_POWERWALL_FAN(){
PWCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS['Powerwall-FAN']}" PWCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS['Powerwall-FAN']}"
if ${PWCMD} [ -f /sys/class/hwmon/hwmon2/fan1_input ]; then
FANINPUT=/sys/class/hwmon/hwmon2/fan1_input
elif ${PWCMD} [ -f /sys/class/hwmon/hwmon3/fan1_input ]; then
FANINPUT=/sys/class/hwmon/hwmon3/fan1_input
fi
${PWCMD} pwmconfig & ${PWCMD} pwmconfig &
sleep 4s sleep 4s
${PWCMD} killall pwmconfig >/dev/null 2>&1 ${PWCMD} killall pwmconfig >/dev/null 2>&1
if ${PWCMD} [ -f ${FANINPUT} ]; then if ${PWCMD} [ -f ${PW_FANINPUT} ]; then
temp_c=$(${PWCMD} cat ${FANINPUT}) temp_c=$(${PWCMD} cat ${PW_FANINPUT})
if [ ${temp_c} -gt 0 ]; then if [ ${temp_c} -gt 0 ]; then
fs=$(IDS_NUMBER_FORMAT ${temp_c}) 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: ${FANINPUT}" FAN: ${PW_FANINPUT}"
else else
SENDNOTICE "FAILED to start ${SENSOR}" "Cannot start the fan, ERROR WILL ROBINSON!!! SENDNOTICE "FAILED to start ${SENSOR}" "Cannot start the fan, ERROR WILL ROBINSON!!!
FAN: ${FANINPUT}" 1 FAN: ${PW_FANINPUT}" 1
fi fi
else else
SENDNOTICE "FAILED to start ${SENSOR}" "Cannot find hardware, 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
@@ -710,14 +705,7 @@ CHECKTEMPSENSOR(){
temp_c=${temp_c%\'*}; temp_c=${temp_c#*=} temp_c=${temp_c%\'*}; temp_c=${temp_c#*=}
fi fi
elif [[ "${1}" = *"FAN"* ]]; then elif [[ "${1}" = *"FAN"* ]]; then
# if [ "${1}" == "Powerwall-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 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 fi
elif [ "${PW_SENSOR_TYPE[${1}]}" == "esxi" ]; then elif [ "${PW_SENSOR_TYPE[${1}]}" == "esxi" ]; then
@@ -986,14 +974,7 @@ CHECKTEMP_SERVICE_RUNSENSOR(){
temp_c=${temp_c%\'*}; temp_c=${temp_c#*=} temp_c=${temp_c%\'*}; temp_c=${temp_c#*=}
fi fi
elif [[ "${SENSOR}" = *"FAN"* ]]; then elif [[ "${SENSOR}" = *"FAN"* ]]; then
# if [ "${1}" == "Powerwall-FAN" ]; then if ! temp_c=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${SENSOR}]} cat ${PW_FANINPUT}) ; then TIMEOUT=1; fi
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[${SENSOR}]} cat ${FANINPUT}) ; then TIMEOUT=1; fi
if [ "${SENSOR}" == "Powerwall-FAN" ] && [ ${temp_c} -lt 1500 ]; then if [ "${SENSOR}" == "Powerwall-FAN" ] && [ ${temp_c} -lt 1500 ]; then
START_POWERWALL_FAN >/dev/null 2>&1 & START_POWERWALL_FAN >/dev/null 2>&1 &
fi fi
@@ -1622,7 +1603,7 @@ SENDTEMP(){
temp_c=$(vcgencmd measure_temp) temp_c=$(vcgencmd measure_temp)
temp_c=${temp_c%\'*}; temp_c=${temp_c#*=} temp_c=${temp_c%\'*}; temp_c=${temp_c#*=}
elif [[ "${SENSOR}" = *"FAN"* ]]; then elif [[ "${SENSOR}" = *"FAN"* ]]; then
temp_c=$(cat ${FANINPUT}) temp_c=$(cat ${PW_FANINPUT})
fi fi
elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "remotesystem" ]; then elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "remotesystem" ]; then