From eba05ef64fc983c9d4eafe1646a16e066d31badb Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 24 Jun 2025 20:44:34 -0500
Subject: [PATCH] update

---
 defaults.inc    |  2 +-
 inc/temp.inc.sh | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 9826b639..8a3952c0 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PW_VERS='2.11.1-06242025'
+PW_VERS='2.11.2-06242025'
 
 noheader=' update service dailytemp confsync -r -report test '
 
diff --git a/inc/temp.inc.sh b/inc/temp.inc.sh
index d56f82a8..340f1e39 100644
--- a/inc/temp.inc.sh
+++ b/inc/temp.inc.sh
@@ -846,9 +846,7 @@ AVERAGETEMP(){
 
 CHECKTEMP_SERVICE(){	
 	cw=20
-	[ "${PW_SERVICE_TEMP_SCANRATE}" != "" ] && runEvery=${PW_SERVICE_TEMP_SCANRATE} || runEvery=1
 	
-	[ "${PW_SCAN_THREADS}" != "" ] && SCAN_THREADS=${PW_SCAN_THREADS} || SCAN_THREADS=4
 	[[ "${IP}" != "10.6."* ]] && SENDTEMPS "TEMP Service Startup" &
 	[ ! -d ${PW_TMPFOLDER}/.lastfancheck ] && mkdir ${PW_TMPFOLDER}/.lastfancheck
 	[ ! -d ${PW_TMPFOLDER}/.lastinsert ] && mkdir ${PW_TMPFOLDER}/.lastinsert
@@ -859,16 +857,11 @@ CHECKTEMP_SERVICE(){
 	while true; do
 		start=$(date +%s)
 		log_start=$(date "+%Y-%m-%d %H:%M:%S")
+				
 		source ${PW_FOLDER}/defaults.inc
-		source ${PW_FOLDER}/conf/settings.conf
+		[ "${PW_SERVICE_TEMP_SCANRATE}" != "" ] && runEvery=${PW_SERVICE_TEMP_SCANRATE} || runEvery=1
+		[ "${PW_SCAN_THREADS}" != "" ] && SCAN_THREADS=${PW_SCAN_THREADS} || SCAN_THREADS=4
 		
-		# time="$(date +%H)$(date +%M)"
-		# if [ ! -f ${PW_TMPFOLDER}/temp.* ] && [ $(date +%H)$(date +%M) -ge 0700 ] && [ $(date +%H)$(date +%M) -lt 0705 ]; then
-		# 	if [ ! -f ${PW_TMPFOLDER}/.sentdaily ] || [ $(expr `date +%s` - $(stat -c %Y ${PW_TMPFOLDER}/.sentdaily)) -gt 600 ]; then
-		# 		touch ${PW_TMPFOLDER}/.sentdaily
-		# 		SENDTEMPS "Daily Temp Readings" yes &
-		# 	fi
-		# fi
 		SENSORS_CHECKED=()
 		for SENSORa in ${PW_SENSOR_ORD[@]}; do
 			until [ $(ls ${PW_TMPFOLDER}/ztemprun.*.running 2>/dev/null | wc -l) -lt ${SCAN_THREADS} ]; do
@@ -910,7 +903,8 @@ CHECKTEMP_SERVICE_RUNSENSOR(){
 	logtemp=${PW_LOGFOLDER}/log-temp-${SENSORa}
 	touch ${PW_TMPFOLDER}/ztemprun.${SENSORa}.running
 	
-	source ${PW_FOLDER}/defaults.inc
+	# source ${PW_FOLDER}/defaults.inc
+	
 	[ "${PW_ESXI_DEF_FANSPEED}" != "" ] && ESXI_DEF_FANSPEED=${PW_ESXI_DEF_FANSPEED} || ESXI_DEF_FANSPEED=${PW_ESXI_DEF_FANSPEED}
 	[ "${PW_ESXI_FANSPEED_GL_ZONE}" != "" ] && ESXI_FANSPEED_GL_ZONE=${PW_ESXI_FANSPEED_GL_ZONE} || ESXI_FANSPEED_GL_ZONE=2.5