From 0c306f633a69aa81e3d8ca0a7cdefd82219fba53 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 19 Jul 2025 14:46:05 -0500
Subject: [PATCH] Update temp.inc.sh

---
 inc/temp.inc.sh | 48 ++++++++++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index 403db216..96b9d104 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -1626,16 +1626,16 @@ SENDTEMP(){
 				elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "lacrosse" ]; then
 					INFO=$(curl -m 5 -s --get -d "deviceid=${PW_SENSOR_DEVICEID[${SENSOR}]}" -d "limit=1" -d "metric=1" -d "timezone=2" https://decent-destiny-704.appspot.com/laxservices/device_info.php | jq)
 					if [[ "${SENSORa}" = *"-Probe" ]]; then
-						temp_c=`IDS_NUMBER_FORMAT $(echo ${INFO} | jq -r '.device0 .obs[].probe_temp') 2 yes`
+						temp_c=$(echo ${INFO} | jq -r '.device0 .obs[].probe_temp')
 					else
-						temp_c=`IDS_NUMBER_FORMAT $(echo ${INFO} | jq -r '.device0 .obs[].ambient_temp') 2 yes`
+						temp_c=$(echo ${INFO} | jq -r '.device0 .obs[].ambient_temp')
 					fi
 					
 				elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esphome" ]; then
 					if ! temp_c=$(curl -m 5 -s GET -H "Authorization: Bearer ${PW_ESPHOME_API}" ${PW_HOMEASSISTANT_URL}/api/states/sensor.${PW_SENSOR_DEVICEID[${SENSORa}]}_temperature | jq -r '.state') ; then TIMEOUT=1; fi
 					if [ "${temp_c}" != "" ]; then
-						temp_f=`IDS_NUMBER_FORMAT ${temp_c} 2 yes`
-						temp_h=`IDS_NUMBER_FORMAT $(curl -m 5 -s GET -H "Authorization: Bearer ${PW_ESPHOME_API}" ${PW_HOMEASSISTANT_URL}/api/states/sensor.${PW_SENSOR_DEVICEID[${SENSORa}]}_humidity | jq -r '.state') 2 yes`
+						temp_f=${temp_c}
+						temp_h=$(curl -m 5 -s GET -H "Authorization: Bearer ${PW_ESPHOME_API}" ${PW_HOMEASSISTANT_URL}/api/states/sensor.${PW_SENSOR_DEVICEID[${SENSORa}]}_humidity | jq -r '.state')
 					else
 						temp_c=''
 					fi
@@ -1643,7 +1643,7 @@ SENDTEMP(){
 				elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "espdev" ]; then
 					if ! temp_c=$(curl -m 8 -s http://${PW_REMOTE_SENSORS[${SENSORa}]}:8090/sensor/${PW_SENSOR_DEVICEID[${SENSORa}]} | jq '.value'); then TIMEOUT=1; fi
 					if [ "${temp_c}" != "" ]; then
-						temp_h=`IDS_NUMBER_FORMAT $(curl -m 8 -s http://${PW_REMOTE_SENSORS[${SENSORa}]}:8090/sensor/${PW_SENSOR_DEVICEID[${SENSORa}]/temperature/humidity} | jq '.value') 2 yes`
+						temp_h=$(curl -m 8 -s http://${PW_REMOTE_SENSORS[${SENSORa}]}:8090/sensor/${PW_SENSOR_DEVICEID[${SENSORa}]/temperature/humidity} | jq '.value')
 					fi
 					
 				elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "tuya" ]; then
@@ -1695,8 +1695,7 @@ SENDTEMP(){
 					fi
 				fi
 				
-				[ "${PW_DESC_TEMP[${SENSOR}]}" != "" ] && SENSOR_DESC=${PW_DESC_TEMP[${SENSOR}]} || SENSOR_DESC=${SENSOR}
-				c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR_DESC}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+
 				if [ "${temp_c}" != "null" ] && [ "${temp_c}" != "" ]; then
 					if [ "${SENSOR}" == "ServerRoomTH" ]; then
 						temp_f=`echo "scale=2; (${temp_c}*(9/5))+32+${PW_ServerRoomTH_Dev}" | tr -d $'\r' | bc`
@@ -1710,20 +1709,29 @@ SENDTEMP(){
 						fi
 						(( $(bc <<<"${temp_f} < 1") )) && [[ "${temp_f}" = *"."* ]] && temp_f="0${temp_f}"
 					fi
-					if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]]; then
-						temp_f_disp=$(IDS_NUMBER_FORMAT ${temp_f} 2 yes)
-						if [ "${1}" != "" ]; then
-							average1_disp=$(IDS_NUMBER_FORMAT ${average1})
-							average7_disp=$(IDS_NUMBER_FORMAT ${average7})
-						fi
-					else
-						temp_f_disp=${temp_f}
-						if [ "${1}" != "" ]; then
-							average1_disp=${average1}
-							average7_disp=${average7}
-						fi
+					
+					# if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]]; then
+					# 	temp_f_disp=$(IDS_NUMBER_FORMAT ${temp_f} 2 yes)
+					# 	if [ "${1}" != "" ]; then
+					# 		average1_disp=$(IDS_NUMBER_FORMAT ${average1} 2 yes)
+					# 		average7_disp=$(IDS_NUMBER_FORMAT ${average7} 2 yes)
+					# 	fi
+					# else
+					# 	temp_f_disp=${temp_f}
+					# 	if [ "${1}" != "" ]; then
+					# 		average1_disp=${average1}
+					# 		average7_disp=${average7}
+					# 	fi
+					# fi
+					temp_f_disp=$(IDS_NUMBER_FORMAT ${temp_f} 2 yes)
+					if [ "${1}" != "" ]; then
+						average1_disp=$(IDS_NUMBER_FORMAT ${average1} 2 yes)
+						average7_disp=$(IDS_NUMBER_FORMAT ${average7} 2 yes)
 					fi
-					[ "${1}" != "" ] && echo -e "${SENSOR_DESC}${spc}${temp_f_disp}${GAUGESH} / ${average1_disp}${GAUGESH} / ${average7_disp}${GAUGESH}" || echo -e "${SENSOR}${spc}${temp_f_disp}${GAUGESH}"
+					
+					[ "${PW_DESC_TEMP[${SENSOR}]}" != "" ] && SENSOR_DESC=${PW_DESC_TEMP[${SENSOR}]} || SENSOR_DESC=${SENSOR}
+					c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR_DESC}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+					[ "${1}" != "" ] && echo -e "${SENSOR_DESC}${spc}${temp_f_disp}${GAUGESH} / ${average1_disp}${GAUGESH} / ${average7_disp}${GAUGESH}" || echo -e "${SENSOR_DESC}${spc}${temp_f_disp}${GAUGESH}"
 				
 				else
 					echo -e "${SENSOR_DESC}${spc}No Data"