From 2c73de88d555a583410fbabdc66053e2fd05c2bf Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 14 Dec 2023 17:19:56 -0600 Subject: [PATCH] Update temp.inc.sh --- inc/temp.inc.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 1decd2f0..b0acd51d 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -133,12 +133,9 @@ CHECKTEMPSENSOR(){ fi if [ "${temp_c}" != "null" ] && [ "${temp_c}" != "" ]; then - if [ "${PW_SENSOR_TYPE[${1}]}" == "cpu" ]; then - temp_f=$(echo "scale=2; $temp_c/1" | bc -l) || temp_f=$(bc <<< "scale=1; ${temp_c}*1.8+32") - elif (( $(bc <<<"${temp_f} < 1") )) && [[ "${temp_f}" = *"."* ]]; then - temp_f="0${temp_f}" - elif [ "${1}" == "ServerRoomTH" ]; then - temp_f=$(bc <<< "scale=1; ${temp_c}*1.8+32") + [ "${PW_SENSOR_TYPE[${1}]}" == "cpu" ] && temp_f=$(echo "scale=2; $temp_c/1" | bc -l) || [ "${1}" != "ServerRoomLA" ] && temp_f=$(bc <<< "scale=1; ${temp_c}*1.8+32") + (( $(bc <<<"${temp_f} < 1") )) && [[ "${temp_f}" = *"."* ]] && temp_f="0${temp_f}" + if [ "${1}" == "ServerRoomTH" ]; then temp_f=`echo "scale=1; ${temp_f}+${PW_ServerRoomTH_Dev}" | bc` elif [ "${1}" == "ServerRoomLA" ]; then temp_f=${temp_c}