diff --git a/defaults.inc b/defaults.inc index a4e39f0d..4b34f7e3 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -PW_VERS='2.8.34-05052025' +PW_VERS='2.8.35-05192025' noheader=' update service dailytemp confsync -r -report test ' diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index bfc2883e..ebefc069 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -115,7 +115,8 @@ CHECKTEMP(){ GAUGESH="°F" fi - # [ ${REPORT} -eq 0 ] && [ ${DETAILS} -eq 0 ] && [ "${last_sensor%%-*}" == "${SENSOR%%-*}" ] && [ "${last_sensor}" != "Offsite-ServerRoom" ] && [ "${last_sensor}" != "Powerwall-Switch" ] && echo -en "\033[1A" + [ ${REPORT} -eq 0 ] && [ ${DETAILS} -eq 0 ] && [ "${last_sensor%%-*}" == "${SENSOR%%-*}" ] && [ "${last_sensor}" != "Offsite-ServerRoom" ] && echo -en "\033[1A" + c=0; spc=''; spc1=`expr ${cw} - ${#SENSOR_DESC}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done [ ${REPORT} -eq 0 ] && echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR_DESC}${idsST[Reset]}${spc}${idsCL[Default]}: ${idsCL[Yellow]}Pulling data ... " @@ -135,7 +136,7 @@ CHECKTEMP(){ fi c=0; spct=''; [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "system" ] && [[ "${SENSOR}" = *"FAN"* ]] && spc1=`expr 6 - ${#temp_f}` || spc1=`expr 7 - ${#temp_f}` until [ ${c} = ${spc1} ]; do spct="${spct} "; ((c++)); done - reading="${lclr}${lmd}${spct}"$(IDS_NUMBER_FORMAT ${temp_f})"${GAUGESH}" + reading="${lclr}${lmd}${spct}"$(IDS_NUMBER_FORMAT ${temp_f} 2 yes)"${GAUGESH}" [ ${REPORT} -eq 0 ] && echo -en "\r\033[K" echo -en "${idsCL[White]}${idsST[Bold]}${SENSOR_DESC}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading} "