From 7a351bb95eeb1b2903669c2977454eb41f518a28 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 6 Feb 2024 18:33:51 -0600 Subject: [PATCH] update --- defaults.inc | 3 ++- inc/temp.inc.sh | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/defaults.inc b/defaults.inc index 0d8f7e79..40e83d55 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='2.5.260-02062024' +VERS='2.5.261-02062024' noheader=' update service dailytemp confsync -r -report ' @@ -63,6 +63,7 @@ if [ -f ${PW_FOLDER}/settings.local.conf ]; then declare -A PW_INVERTER_MODES declare -A PW_INVERTER_ERRORS declare -A PW_LACROSSE_ID + declare -A PW_SENSOR_DEVICEID source ${PW_FOLDER}/settings.local.conf diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 222efe3e..09078620 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -279,6 +279,10 @@ CHECKTEMPSENSOR(){ TIMEOUT=1 fi fi + + elif [ "${PW_SENSOR_TYPE[${1}]}" == "ds18b20" ]; then + if ! temp_c=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${PW_REMOTE_SENSORS[${1}]} cat /sys/bus/w1/devices/${PW_SENSOR_DEVICEID[${1}]}/w1_slave | tail -n1 | cut -d "=" -f2) ; then TIMEOUT=1; fi + [ "${temp_c}" != "" ] && temp_c=$(ROUND_NUMBER ${temp_c} 2) fi if [ "${temp_c}" != "null" ] && [ "${temp_c}" != "" ]; then