voltron/powerwall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update temp.inc.sh

Browse Source
This commit is contained in:
David Schroeder
2024-01-28 17:25:18 -06:00
parent d079c67abe
commit b1a4ac64ad
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
inc/temp.inc.sh
View File

@@ -44,11 +44,13 @@ CHECKTEMP(){
fi fi
echo echo
if [ "${avgdays}" != "" ]; then if [ "${avgdays}" != "" ]; then
if [ $(bc -l <<< "${avgdays} < 1") -eq 1 ]; then if [[ "${avgdays^^}" = *"M"* ]]; then
avgdays_disp="$(ROUND_NUMBER $(bc <<< "scale=2; ${avgdays}*24*60") 0)Min" avgdays_disp="${avgdays::-1}Min"
elif [ $(bc -l <<< "${avgdays} < 10") -eq 1 ]; then elif [[ "${avgdays^^}" = *"H"* ]]; then
avgdays_disp=" ${avgdays}Day" avgdays_disp="${avgdays::-1}Hrs"
else elif [[ "${avgdays^^}" = *"D"* ]]; then
avgdays_disp="${avgdays::-1}Day"
elif [[ "${avgdays}" =~ ^[0-9]+$ ]]; then
avgdays_disp="${avgdays}Day" avgdays_disp="${avgdays}Day"
fi fi
echo -e "${idsCL[Cyan]}Sensor Temperature(s) Current / ${idsCL[LightYellow]}${avgdays_disp}AVG ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[LightRed]}critical${idsCL[Default]}" echo -e "${idsCL[Cyan]}Sensor Temperature(s) Current / ${idsCL[LightYellow]}${avgdays_disp}AVG ${idsCL[Yellow]}warning${idsCL[Default]} / ${idsCL[LightRed]}critical${idsCL[Default]}"
@@ -139,10 +141,14 @@ CHECKTEMP(){
if [ ! -f ${PW_TMPFOLDER}/${SENSOR}.down ]; then if [ ! -f ${PW_TMPFOLDER}/${SENSOR}.down ]; then
echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${idsCL[Yellow]}" echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${idsCL[Yellow]}"
if [ "${avgdays}" != "noavg" ]; then if [ "${avgdays}" != "noavg" ]; then
if [ $(bc -l <<< "${avgdays} < 1") -eq 1 ]; then if [[ "${avgdays^^}" = *"M"* ]]; then
avgdays_disp="$(ROUND_NUMBER $(bc <<< "scale=2; ${avgdays}*24*60") 0) Minute" avgdays_disp="${avgdays::-1} Minute"
else elif [[ "${avgdays^^}" = *"H"* ]]; then
avgdays_disp="${avgdays} Day" avgdays_disp="${avgdays::-1} Hour"
elif [[ "${avgdays^^}" = *"D"* ]]; then
avgdays_disp="${avgdays::-1} Day"
elif [[ "${avgdays}" =~ ^[0-9]+$ ]]; then
avgdays_disp="${avgdays::-1} Day"
fi fi
echo -en "Pulling data and calculating ${avgdays_disp} average ... " echo -en "Pulling data and calculating ${avgdays_disp} average ... "
else else
@@ -315,7 +321,18 @@ AVERAGETEMP(){
else else
WHERE="sensorid=${sensorid}" WHERE="sensorid=${sensorid}"
fi fi
[ $(bc -l <<< "${daysback} < 1") -eq 1 ] && interval="$(ROUND_NUMBER $(bc <<< "scale=2; ${daysback}*24*60")) HOUR" || interval="${daysback} MINUTE"
if [[ "${daysback^^}" = *"M"* ]]; then
interval="${avgdays::-1} MINUTE"
elif [[ "${daysback^^}" = *"H"* ]]; then
interval="${avgdays::-1} HOUR"
elif [[ "${daysback^^}" = *"D"* ]]; then
interval="${avgdays::-1} DAY"
elif [[ "${daysback}" =~ ^[0-9]+$ ]]; then
interval="${avgdays} DAY"
fi
while IFS=$'\t' read date temp hum speed ;do while IFS=$'\t' read date temp hum speed ;do
if [ "${3}" == "FanSpeed" ] && [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${sensor}]}"* ]]; then if [ "${3}" == "FanSpeed" ] && [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${sensor}]}"* ]]; then
temptotal=$(bc <<< "scale=2; ${temptotal}+${speed}") temptotal=$(bc <<< "scale=2; ${temptotal}+${speed}")