diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 7c7e89ea..142655bc 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -1047,24 +1047,24 @@ OFFSITE_CHECKPOWER_SERVICE(){ fi if [ "${PW_OFFSITE_MONITOR}" == "${IP}" ]; then - if [ ! -d /sys/bus/w1/devices/${PW_SENSOR_DEVICEID['Offsite-ServerRoom']} ]; then + if [ ! -d /sys/devices/w1_bus_master1/${PW_SENSOR_DEVICEID['Offsite-ServerRoom']} ]; then /bin/dtoverlay w1-gpio gpiopin=4 sleep 2s fi - if [ -d /sys/bus/w1/devices/${PW_SENSOR_DEVICEID['Offsite-ServerRoom']} ]; then - temp_c=$(cat /sys/bus/w1/devices/${PW_SENSOR_DEVICEID['Offsite-ServerRoom']}/w1_slave | tail -n1 | cut -d "=" -f2) + if [ -d /sys/devices/w1_bus_master1/${PW_SENSOR_DEVICEID['Offsite-ServerRoom']} ]; then + temp_c=$(cat /sys/devices/w1_bus_master1/${PW_SENSOR_DEVICEID['Offsite-ServerRoom']}/w1_slave | tail -n1 | cut -d "=" -f2) OFFSITE_TEMP=$(bc <<< "scale=2; ((${temp_c}/1000)*(9/5))+32") else OFFSITE_TEMP=ERR fi else - if ${SSHCMD} root@${PW_OFFSITE_MONITOR} [ ! -d /sys/bus/w1/devices/${PW_SENSOR_DEVICEID['Offsite-ServerRoom']} ]; then + if ${SSHCMD} root@${PW_OFFSITE_MONITOR} [ ! -d /sys/devices/w1_bus_master1/${PW_SENSOR_DEVICEID['Offsite-ServerRoom']} ]; then ${SSHCMD} root@${PW_OFFSITE_MONITOR} '/bin/dtoverlay w1-gpio gpiopin=4' sleep 2s fi - if ${SSHCMD} root@${PW_OFFSITE_MONITOR} [ -d /sys/bus/w1/devices/${PW_SENSOR_DEVICEID['Offsite-ServerRoom']} ]; then - temp_c=$(${SSHCMD} root@${PW_OFFSITE_MONITOR} cat /sys/bus/w1/devices/${PW_SENSOR_DEVICEID['Offsite-ServerRoom']}/w1_slave | tail -n1 | cut -d "=" -f2) + if ${SSHCMD} root@${PW_OFFSITE_MONITOR} [ -d /sys/devices/w1_bus_master1/${PW_SENSOR_DEVICEID['Offsite-ServerRoom']} ]; then + temp_c=$(${SSHCMD} root@${PW_OFFSITE_MONITOR} cat /sys/devices/w1_bus_master1/${PW_SENSOR_DEVICEID['Offsite-ServerRoom']}/w1_slave | tail -n1 | cut -d "=" -f2) OFFSITE_TEMP=$(bc <<< "scale=2; ((${temp_c}/1000)*(9/5))+32") else OFFSITE_TEMP=ERR diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index d7863a0e..49610bc1 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -734,7 +734,7 @@ CHECKTEMPSENSOR(){ temp_c='' fi - elif [ "${PW_SENSOR_TYPE[${1}]}" == "system" ]; then + elif [ "${PW_SENSOR_TYPE[${1}]}" == "system" ] || "${PW_SENSOR_TYPE[${1}]}" == "remotesystem" ]; then if [[ "${1}" = *"CPU"* ]]; then if ! temp_c=$(${SSHCMD} root@${PW_REMOTE_SENSORS[${1}]} vcgencmd measure_temp) ; then TIMEOUT=1; fi if [ "${temp_c}" != "" ]; then