diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index 0a9672dd..21692051 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -1698,6 +1698,8 @@ SENDTEMP(){ if [ "${temp_c}" != "null" ] && [ "${temp_c}" != "" ]; then + [ "${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 [ "${SENSOR}" == "ServerRoomTH" ]; then temp_f=`echo "scale=2; (${temp_c}*(9/5))+32+${PW_ServerRoomTH_Dev}" | tr -d $'\r' | bc` else @@ -1730,8 +1732,7 @@ SENDTEMP(){ average7_disp=$(IDS_NUMBER_FORMAT ${average7} 2 yes) 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 + [ "${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} (${cw} - ${#SENSOR_DESC} = ${spc1})" else