mir/lm-sensors
2
0
Fork 0
mirror of https://github.com/lm-sensors/lm-sensors synced 2025-09-02 15:25:38 +00:00
Code Issues Releases Wiki Activity

Skip MINSTOP and MINSTART tests if fan can't stop.

Browse Source 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5328 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare
2008-09-09 13:15:04 +00:00
parent 346159764f
commit 012aae9b58
2 changed files with 49 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@@ -11,6 +11,7 @@ SVN-HEAD
Print the revision and date at start-up Print the revision and date at start-up
Detect and report obviously incorrect fan speeds Detect and report obviously incorrect fan speeds
Determine MINSTOP automatically Determine MINSTOP automatically
Skip MINSTOP and MINSTART tests if fan can't stop
sensors-detect: Add Intel SCH (bus) support sensors-detect: Add Intel SCH (bus) support
Add SMSC EMC6D103 support Add SMSC EMC6D103 support
Improve MAX6657, MAX6658, MAX6659 detection Improve MAX6657, MAX6658, MAX6659 detection

23
prog/pwm/pwmconfig
View File

@@ -453,8 +453,10 @@ do
let pwmactivecount=1 let pwmactivecount=1
pwmactive="$i ${pwmactive}" pwmactive="$i ${pwmactive}"
fanactive="$j ${fanactive}" fanactive="$j ${fanactive}"
fanactive_min="$S ${fanactive_min}"
else else
fanactive="$j+${fanactive}" #not supported yet by fancontrol fanactive="$j+${fanactive}" #not supported yet by fancontrol
fanactive_min="$S+${fanactive_min}"
fi fi
sleep $DELAY sleep $DELAY
if [ $? -ne 0 ] if [ $? -ne 0 ]
@@ -756,6 +758,7 @@ select pwms in $pwmactive "Change INTERVAL" "Just quit" "Save and quit" "Show co
echo "$j $S" echo "$j $S"
done done
FAN=`echo $fanactive|cut -d' ' -f$REPLY` FAN=`echo $fanactive|cut -d' ' -f$REPLY`
FAN_MIN=`echo $fanactive_min|cut -d' ' -f$REPLY`
FCFANS="`echo $FCFANS | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=$FAN" FCFANS="`echo $FCFANS | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=$FAN"
echo echo
echo "Select a temperature sensor as source for ${pwms}:" echo "Select a temperature sensor as source for ${pwms}:"
@@ -800,10 +803,14 @@ select pwms in $pwmactive "Change INTERVAL" "Just quit" "Save and quit" "Show co
else else
MAXTEMP="`echo $MAXTEMP | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${XMT}" MAXTEMP="`echo $MAXTEMP | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${XMT}"
fi fi
if [ $FAN_MIN -eq 0 ]
then
echo echo
echo "Enter the minimum PWM value (0-$MAX)" echo "Enter the minimum PWM value (0-$MAX)"
echo -n "at which the fan STOPS spinning (press t to test) ($DEFMINSTOP): " echo -n "at which the fan STOPS spinning (press t to test) ($DEFMINSTOP): "
read XMSTOP read XMSTOP
if [ "$XMSTOP" = "" ] if [ "$XMSTOP" = "" ]
then then
XMSTOP=$DEFMINSTOP XMSTOP=$DEFMINSTOP
@@ -813,16 +820,23 @@ select pwms in $pwmactive "Change INTERVAL" "Just quit" "Save and quit" "Show co
TestMinStop $FAN TestMinStop $FAN
XMSTOP=$fanval XMSTOP=$fanval
fi fi
else
XMSTOP=0
fi
if [ "$MINSTOP" = "" ] if [ "$MINSTOP" = "" ]
then then
MINSTOP="${pwms}=${XMSTOP}" MINSTOP="${pwms}=${XMSTOP}"
else else
MINSTOP="`echo $MINSTOP | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${XMSTOP}" MINSTOP="`echo $MINSTOP | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${XMSTOP}"
fi fi
if [ $FAN_MIN -eq 0 ]
then
echo echo
echo "Enter the minimum PWM value ($XMSTOP-$MAX)" echo "Enter the minimum PWM value ($XMSTOP-$MAX)"
echo -n "at which the fan STARTS spinning (press t to test) ($DEFMINSTART): " echo -n "at which the fan STARTS spinning (press t to test) ($DEFMINSTART): "
read XMSTART read XMSTART
if [ "$XMSTART" = "" ] if [ "$XMSTART" = "" ]
then then
XMSTART=$DEFMINSTART XMSTART=$DEFMINSTART
@@ -832,16 +846,25 @@ select pwms in $pwmactive "Change INTERVAL" "Just quit" "Save and quit" "Show co
TestMinStart $XMSTOP TestMinStart $XMSTOP
XMSTART=$fanval XMSTART=$fanval
fi fi
else
XMSTART=$DEFMINSTART
fi
if [ "$MINSTART" = "" ] if [ "$MINSTART" = "" ]
then then
MINSTART="${pwms}=${XMSTART}" MINSTART="${pwms}=${XMSTART}"
else else
MINSTART="`echo $MINSTART | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${XMSTART}" MINSTART="`echo $MINSTART | sed -e "s/${pwmsed}[^ ]* *//g"` ${pwms}=${XMSTART}"
fi fi
if [ $XMSTOP -gt 0 ]
then
echo echo
echo "Enter the PWM value (0-$XMSTOP) to use when the temperature" echo "Enter the PWM value (0-$XMSTOP) to use when the temperature"
echo -n "is below the low temperature limit (0): " echo -n "is below the low temperature limit (0): "
read XMINP read XMINP
else
XMINP=""
fi
if [ -n "$XMINP" ] if [ -n "$XMINP" ]
then then
if [ "$MINPWM" = "" ] if [ "$MINPWM" = "" ]