diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh index eef8ea5c..691f1214 100644 --- a/inc/temp.inc.sh +++ b/inc/temp.inc.sh @@ -644,16 +644,23 @@ SERVERROOM_TEMP_DIFFERENCE(){ read -rd '' -a tempdiffs <<<"${tempdiffs}" unset IFS tempdiff_total=0; scansfound=0 + tempdiff_large_total=0; scansfound_large=0 for tempdiff in "${tempdiffs[@]}"; do [[ "${tempdiff}" = *"~"* ]] && tempdiff=${tempdiff#*~} - [ $(bc -l <<< "${tempdiff} >= ${largest_tempdiff}") -eq 1 ] && largest_tempdiff=${tempdiff} - tempdiff_total=$(bc <<< "scale=2; ${tempdiff_total}+${tempdiff}") - ((scansfound++)) + if [ $(bc -l <<< "${tempdiff} <= 15") -eq 1 ]; then + [ $(bc -l <<< "${tempdiff} >= ${largest_tempdiff}") -eq 1 ] && largest_tempdiff=${tempdiff} + tempdiff_total=$(bc <<< "scale=2; ${tempdiff_total}+${tempdiff}") + ((scansfound++)) + else + tempdiff_large_total=$(bc <<< "scale=2; ${tempdiff_large_total}+${tempdiff}") + ((scansfound_large++)) + fi done # if [ $(bc -l <<< "${largest_tempdiff} < 1") -eq 1 ]; then [ "${largest_tempdiff}" = "0" ] && largest_tempdiff="0.0" || largest_tempdiff="0${largest_tempdiff}"; fi largest_tempdiff=`IDS_NUMBER_FORMAT ${largest_tempdiff} 2 yes` [ ${scansfound} -eq 0 ] && average=0 || average=$(bc <<< "scale=2; ${tempdiff_total}/${scansfound}") + [ ${scansfound_large} -eq 0 ] && average_large=0 || average_large=$(bc <<< "scale=2; ${tempdiff_large_total}/${scansfound_large}") # if [ $(bc -l <<< "${average} < 1") -eq 1 ]; then [ "${average}" = "0" ] && average="0.0" || average="0${average}"; fi average=`IDS_NUMBER_FORMAT ${average} 2 yes` @@ -664,6 +671,7 @@ SERVERROOM_TEMP_DIFFERENCE(){ DIVIDER . lightCyan 60 echo -e "${idsCL[Green]}Average for last `IDS_NUMBER_FORMAT ${scansfound}` ${idsCL[LightGreen]}${average}'F${idsCL[Default]}" DIVIDER . lightCyan 60 + echo -e "${idsCL[Cyan]} - Large runs `IDS_NUMBER_FORMAT ${scansfound_large}` ${idsCL[LightCyan]}${average_large}'F${idsCL[Default]}" echo echo -e "${idsCL[LightCyan]}Largest Temp Difference : ${idsCL[LightGreen]}${largest_tempdiff}'F${idsCL[Default]}" echo