Update temp.inc.sh
This commit is contained in:
@@ -1611,7 +1611,8 @@ SENDTEMP(){
|
|||||||
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" != "esxi" ] && ([ "${PW_SENSOR_TYPE[${SENSORa}]}" == "lacrosse" ] || ([ "${PW_REMOTE_SENSORS[${SENSORa}]}" != "" ] && [ "$(CHECK_HOST ${PW_REMOTE_SENSORS[${SENSORa}]})" != "false" ])); then
|
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" != "esxi" ] && ([ "${PW_SENSOR_TYPE[${SENSORa}]}" == "lacrosse" ] || ([ "${PW_REMOTE_SENSORS[${SENSORa}]}" != "" ] && [ "$(CHECK_HOST ${PW_REMOTE_SENSORS[${SENSORa}]})" != "false" ])); then
|
||||||
SENSORS_CHECK=(${SENSORa})
|
SENSORS_CHECK=(${SENSORa})
|
||||||
for SENSOR in "${SENSORS_CHECK[@]}"; do
|
for SENSOR in "${SENSORS_CHECK[@]}"; do
|
||||||
# echo "HERE: ${SENSOR} - ${SENSORa} ~ ${PW_DESC_TEMP[${SENSOR}]}"
|
[ "${PW_DESC_TEMP[${SENSOR}]}" != "" ] && SENSOR_DESC=${PW_DESC_TEMP[${SENSOR}]} || SENSOR_DESC=${SENSOR}
|
||||||
|
# echo "HERE: ${SENSOR} - ${SENSORa} ~ ${SENSOR_DESC}"
|
||||||
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "cpu" ]; then
|
if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "cpu" ]; then
|
||||||
GAUGESH="'%"
|
GAUGESH="'%"
|
||||||
elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]]; then
|
elif [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]]; then
|
||||||
@@ -1619,7 +1620,7 @@ SENDTEMP(){
|
|||||||
else
|
else
|
||||||
GAUGESH="'F"
|
GAUGESH="'F"
|
||||||
fi
|
fi
|
||||||
[ "${last_sensor}" != "" ] && [ "${last_sensor%%-*}" != "${PW_DESC_TEMP[${SENSOR}]%%-*}" ] && echo
|
[ "${last_sensor}" != "" ] && [ "${last_sensor%%-*}" != "${SENSOR_DESC%%-*}" ] && echo
|
||||||
if [ "${mqtt_conn}" != "" ] && [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "mqtt" ]; then
|
if [ "${mqtt_conn}" != "" ] && [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "mqtt" ]; then
|
||||||
mqtt_message=`${mqtt_conn} -t tele/${SENSORa}/SENSOR -C 1`
|
mqtt_message=`${mqtt_conn} -t tele/${SENSORa}/SENSOR -C 1`
|
||||||
echo ${mqtt_message} | cut -d':' -f 6 | cut -d',' -f 1 | read temp_c
|
echo ${mqtt_message} | cut -d':' -f 6 | cut -d',' -f 1 | read temp_c
|
||||||
@@ -1730,7 +1731,6 @@ SENDTEMP(){
|
|||||||
average7_disp=$(IDS_NUMBER_FORMAT ${average7} 2 yes)
|
average7_disp=$(IDS_NUMBER_FORMAT ${average7} 2 yes)
|
||||||
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
|
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})"
|
[ "${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})"
|
||||||
|
|
||||||
@@ -1738,7 +1738,7 @@ SENDTEMP(){
|
|||||||
echo -e "${SENSOR_DESC}${spc}No Data"
|
echo -e "${SENSOR_DESC}${spc}No Data"
|
||||||
|
|
||||||
fi
|
fi
|
||||||
last_sensor=${PW_DESC_TEMP[${SENSOR}]}
|
last_sensor=${SENSOR_DESC}
|
||||||
done
|
done
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user