From 5dee16319eb6182318e68be4ab9eb586c904b24e Mon Sep 17 00:00:00 2001
From: "Mark D. Studebaker" <mdsxyz123@yahoo.com>
Date: Mon, 15 Dec 2003 03:50:09 +0000
Subject: [PATCH] more fixes and improvements

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2178 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 prog/pwm/fancontrol | 31 ++++++++++++++++++++-----------
 prog/pwm/pwmconfig  | 22 ++++++++++++++++------
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/prog/pwm/fancontrol b/prog/pwm/fancontrol
index f0c556d4..97937d16 100755
--- a/prog/pwm/fancontrol
+++ b/prog/pwm/fancontrol
@@ -39,6 +39,8 @@
 #
 #
 
+DEBUG=1
+
 echo $$ > /var/run/fancontrol.pid
 
 function LoadConfig {
@@ -118,17 +120,20 @@ function UpdateFanSpeeds {
 		minso=${AFCMINSTOP[$fcvcount]}
 		
 		tval=`cat ${tsens} |cut -d' ' -f3 |cut -d'.' -f1`
-		pwmpval=`cat ${pwmo}`
+		pwmpval=`cat ${pwmo} | cut -d' ' -f1`
 		
 		# debug info
-		#echo "pwmo=$pwmo"
-		#echo "tsens=$tsens"
-		#echo "mint=$mint"
-		#echo "maxt=$maxt"
-		#echo "minsa=$minsa"
-		#echo "minso=$minso"
-		#echo "tval=$tval"
-		#echo "pwmpval=$pwmpval"
+		if [ "$DEBUG" != "" ]
+		then
+			echo "pwmo=$pwmo"
+			echo "tsens=$tsens"
+			echo "mint=$mint"
+			echo "maxt=$maxt"
+			echo "minsa=$minsa"
+			echo "minso=$minso"
+			echo "tval=$tval"
+			echo "pwmpval=$pwmpval"
+		fi
 		
 		if (( $tval <= $mint ))
 		  then pwmval=0 # at specified mintemp shut fan off
@@ -136,14 +141,18 @@ function UpdateFanSpeeds {
 		  then pwmval=255 # at specified maxtemp switch to 100%
 		else 
 		  # calculate the new value from temperature and settings
-		  pwmval=`calc "((10/(${maxt}-${mint})*(${tval}-${mint}))^2/1000*(${maxt}-${mint})*(255-${minso})+${minso})" |cut -d'.' -f1`
-		  if (( $pwmpval == 0 ))
+		  pwmval=`calc "((10/(${maxt}-${mint})*(${tval}-${mint}))^2/100*(255-${minso})+${minso})" |cut -d'.' -f1`
+		  if [ $pwmpval -eq 0 ]
 		  then # if fan was stopped start it using a safe value
 		  	echo $minsa > $pwmo
 			sleep 1
 		  fi
 		fi
 		echo $pwmval > $pwmo # write new value to pwm output
+		if [ "$DEBUG" != "" ]
+		then
+			echo "new pwmval=$pwmval"
+		fi
 		fcvcount=$fcvcount+1
 	done
 }
diff --git a/prog/pwm/pwmconfig b/prog/pwm/pwmconfig
index 5f244db0..eddfcc60 100755
--- a/prog/pwm/pwmconfig
+++ b/prog/pwm/pwmconfig
@@ -140,7 +140,7 @@ function pwmdetail()
 	type $PLOTTER > /dev/null 2>&1
 	if [ $? -eq 0 ]
 	then
-		echo -n "    Would you like to generate a graphical plot using $PLOTTER (y)? "
+		echo -n "Would you like to generate a graphical plot using $PLOTTER (y)? "
 		read X
 		if [ "$X" = "y" -o "$X" = "Y" -o "$X" = "" ]
 		then
@@ -295,7 +295,7 @@ then
 fi
 
 TEMPS=`echo */temp[1-9]`
-if [ "*/temp[1-9]" = "$TEMPS" ]
+if [ "*/temp[0-9]*" = "$TEMPS" ]
 then
 	echo $0: 'There are no temperature-capable sensor modules installed'
 	exit 1
@@ -345,7 +345,8 @@ function TestMinStart {
 	echo
 	echo 'Now we increase the PWM value in 10-unit-steps.'
 	echo 'Let the fan stop completely, then press return until the'
-	echo 'fan starts spinning. We will use this value +20 to be safe.'
+	echo "fan starts spinning. Then enter 'y'."
+	echo 'We will use this value +20 as the starting speed.'
 	let fanok=0
 	let fanval=0
 	until [ "$fanok" = "1" ]
@@ -355,7 +356,7 @@ function TestMinStart {
 		echo -n "Setting $pwms to $fanval..."
 		echo $fanval > $pwms
 		read FANTEST
-		if [ "$FANTEST" = "y" -o "$FANTEST" = "Y" ] ; then let fanok=1 ; fi
+		if [ "$FANTEST" != "" ] ; then let fanok=1 ; fi
 	done
 	let fanval=fanval+20
 	if [ $fanval -gt 240 ] ; then let fanval=255 ; fi
@@ -367,7 +368,8 @@ function TestMinStop {
         echo
         echo 'Now we decrease the PWM value in 10-unit-steps.'
 	echo 'Let the fan reach full speed, then press return until the'
-	echo 'fan stops spinning. We will use this value +20 as the minimum speed.'
+	echo "fan stops spinning. Then enter 'y'."
+	echo 'We will use this value +20 as the minimum speed.'
         let fanok=0
         let fanval=255
         until [ "$fanok" = "1" ]
@@ -377,7 +379,7 @@ function TestMinStop {
                 echo -n "Setting $pwms to $fanval..."
                 echo $fanval > $pwms
                 read FANTEST
-                if [ "$FANTEST" = "y" -o "$FANTEST" = "Y" ] ; then let fanok=1 ; fi
+		if [ "$FANTEST" != "" ] ; then let fanok=1 ; fi
         done
         let fanval=fanval+20
         if [ $fanval -gt 255 ] ; then let fanval=255 ; fi
@@ -439,6 +441,13 @@ select pwms in $pwmactive "Change INTERVAL" "Just quit" "Save and quit" "Show co
 	"`echo ${pwmactive} |sed -e 's/ /\n/g' | egrep \"${pwms}\"`" )
 		pwmsed=`echo ${pwms} | sed -e 's/\//\\\\\//g'` #escape / for sed
 		echo
+		echo 'Current temperature readings are as follows:'
+		for j in $TEMPS
+		do
+			S=`cat $j | cut -d' ' -f3`
+			echo "$j	$S"
+		done
+		echo
 		echo "Select a temperature sensor as source for ${pwms}:"
 		select tempss in $TEMPS "None (Do not affect this PWM output)"; do
 			if [ "$tempss" = "None (Do not affect this PWM output)" ]
@@ -519,6 +528,7 @@ select pwms in $pwmactive "Change INTERVAL" "Just quit" "Save and quit" "Show co
 			else
 				MINSTOP="`echo $MINSTOP | sed -e \"s/${pwmsed}[^ ]* *//g\"` ${pwms}=${XMV}"
 			fi
+			echo
 			break;
 		done ;;