From 57811e6ff808bb0b05b3b0144f72d855ac5165c4 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 14 Dec 2023 21:45:48 -0600 Subject: [PATCH] Update temp.inc.sh --- inc/temp.inc.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index c17a1223..b4cb5af9 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -107,10 +107,12 @@ CHECKTEMPSENSOR(){ echo ${mqtt_message} | cut -d':' -f 6 | cut -d',' -f 1 | read temp_c elif [ "${PW_SENSOR_TYPE[${1}]}" == "lacrosse" ]; then - INFO=$(/bin/python3 ${PW_INCFOLDER}/getInfo.lacrosse.py "${PW_LACROSSE_ID[${1}]}" | sed -e "s/\[{'//g" | sed -e "s/}\]//g" | sed -e "s/', '/~/g" | sed -e "s/': '/:/g" | sed -e "s/': /:/g") - IFS=$'~'; read -rd '' -a INFO <<<"${INFO}"; unset IFS; declare -A DEVICE_INFO - for DINFOtmp in "${INFO[@]}"; do key=${DINFOtmp%%:*}; val=${DINFOtmp##*:}; val=${val//[$'\t\r\n ']}; DEVICE_INFO[${key}]=${val}; done - temp_c=${DEVICE_INFO['probe_temp']} + # INFO=$(/bin/python3 ${PW_INCFOLDER}/getInfo.lacrosse.py "${PW_LACROSSE_ID[${1}]}" | sed -e "s/\[{'//g" | sed -e "s/}\]//g" | sed -e "s/', '/~/g" | sed -e "s/': '/:/g" | sed -e "s/': /:/g") + # IFS=$'~'; read -rd '' -a INFO <<<"${INFO}"; unset IFS; declare -A DEVICE_INFO + # for DINFOtmp in "${INFO[@]}"; do key=${DINFOtmp%%:*}; val=${DINFOtmp##*:}; val=${val//[$'\t\r\n ']}; DEVICE_INFO[${key}]=${val}; done + # temp_c=${DEVICE_INFO['probe_temp']} + INFO=$(https://decent-destiny-704.appspot.com/laxservices/device_info.php?deviceid=${PW_LACROSSE_ID[${1}]}&limit=1&metric=1&timezone=2) + temp_c=$(echo ${INFO} | jq -r '.device0 .obs[].probe_temp') elif [ "${PW_SENSOR_TYPE[${1}]}" == "system" ]; then temp_c=$(vcgencmd measure_temp) @@ -138,8 +140,6 @@ CHECKTEMPSENSOR(){ if [ "${temp_c}" != "null" ] && [ "${temp_c}" != "" ]; then if [ "${1}" == "ServerRoomTH" ]; then temp_f=`echo "scale=1; $(bc <<< "scale=1; ${temp_c}*1.8+32")+${PW_ServerRoomTH_Dev}" | bc` - elif [ "${1}" == "ServerRoomLA" ]; then - temp_f=${temp_c} else [ "${PW_SENSOR_TYPE[${1}]}" == "cpu" ] && temp_f=$(echo "scale=2; $temp_c/1" | bc -l) || temp_f=$(bc <<< "scale=1; ${temp_c}*1.8+32") (( $(bc <<<"${temp_f} < 1") )) && [[ "${temp_f}" = *"."* ]] && temp_f="0${temp_f}"