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

update

Browse Source
This commit is contained in:
David Schroeder
2024-01-28 15:42:13 -06:00
parent a1026ca8ec
commit 18dcb4aa27
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='2.5.183-01282024' VERS='2.5.184-01282024'
noheader=' update service dailytemp confsync -r -report ' noheader=' update service dailytemp confsync -r -report '

4
inc/temp.inc.sh
View File

@@ -76,7 +76,7 @@ CHECKTEMP(){
echo -en "${idsCL[LightCyan]} [FanSpeed=$(cat ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt})'% " echo -en "${idsCL[LightCyan]} [FanSpeed=$(cat ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt})'% "
if [ "${avgdays}" != "noavg" ]; then if [ "${avgdays}" != "noavg" ]; then
echo -en "${idsCL[Yellow]}Calculating ${avgdays} Day average ... ${idsCL[LightCyan]}]" echo -en "${idsCL[Yellow]}Calculating ${avgdays} Day average ... ${idsCL[LightCyan]}]"
fan_average=$(AVERAGETEMP ${SENSOR} ${avgdays} FanSpeed) fan_average=$(bc <<< "scale=0; $(ROUNDHALVES $(bc <<< "scale=3; $(AVERAGETEMP ${SENSOR} ${avgdays} FanSpeed)/10"))*10/1")
echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR} Host Sensors ${idsST[Reset]}${idsCL[White]}[${vHOSTiDRACIP}]" echo -en "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR} Host Sensors ${idsST[Reset]}${idsCL[White]}[${vHOSTiDRACIP}]"
echo -e "${idsCL[LightCyan]} [FanSpeed=$(cat ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt})'% AVG=${fan_average}'%)]${idsCL[Default]}" echo -e "${idsCL[LightCyan]} [FanSpeed=$(cat ${PW_TMPFOLDER}/.fanspeed.${SENSOR}.${cdt})'% AVG=${fan_average}'%)]${idsCL[Default]}"
@@ -327,7 +327,7 @@ AVERAGETEMP(){
((logsfound++)) ((logsfound++))
done < <(${mysql_conn} -se "USE servermonitor; SELECT date,temp,hum,speed from sensor_data WHERE ${WHERE} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${interval}) AND NOW() ORDER BY id DESC;") done < <(${mysql_conn} -se "USE servermonitor; SELECT date,temp,hum,speed from sensor_data WHERE ${WHERE} AND date BETWEEN DATE_SUB(DATE(NOW()), INTERVAL ${interval}) AND NOW() ORDER BY id DESC;")
if [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${sensor}]}"* ]]; then if [[ "${PW_ESXI_FANSPEEDCONTROL_HOSTS}" = *"${PW_HOST_IDRACS[${sensor}]}"* ]]; then
average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}") 2 yes) average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}") 2)
elif [ "${sensorid}" == "19" ]; then elif [ "${sensorid}" == "19" ]; then
# average=$(bc <<< "scale=0; ${temptotal}/${logsfound}") # average=$(bc <<< "scale=0; ${temptotal}/${logsfound}")
average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}") 0) average=$(ROUND_NUMBER $(bc <<< "scale=2; ${temptotal}/${logsfound}") 0)