diff --git a/CHANGES b/CHANGES index 65b97620..eda0e9d5 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,7 @@ SVN-HEAD isaset: Use geteuid instead of getuid so that setuid bit works Makefile: Include generated source files in dependency checking Make it possible to skip building of the static library + fancontrol: Add support for absolute path to hwmon devices sensors-detect: Add nNidia nForce MCP78S SMBus detection Display Super-I/O address even if LD is disabled Differentiate between PC8374L and WPCD377I diff --git a/doc/fancontrol.txt b/doc/fancontrol.txt index 77531ebd..40e290fd 100644 --- a/doc/fancontrol.txt +++ b/doc/fancontrol.txt @@ -99,14 +99,14 @@ VARIABLE=chip/pwmdev=value chip/pwmdev2=value2 [...] VARIABLE2=[...] Each variable has its own line. The variable name is followed by an equal sign -and the device=value pairs. These consist of the relative path to the pwm -output (from /sys/bus/i2c/devices or /sys/class/hwmon depending on the kernel -version) for which the value is valid, equal sign followed by the value and -are separated by a blank. +and the device=value pairs. These consist of the path to the pwm output for +which the value is valid, equal sign followed by the value and are separated +by a blank. Path can be absolute or relative (from /sys/bus/i2c/devices or +/sys/class/hwmon depending on the kernel version). Example: -MINTEMP=w83627hf-isa-0290/pwm2=40 w83627hf-isa-0290/pwm1=54 +MINTEMP=hwmon0/device/pwm1=40 hwmon0/device/pwm2=54 You have to play with the temperature values a bit to get happy. For initial setup I recommend using the pwmconfig script. Small changes can be made by diff --git a/prog/pwm/fancontrol b/prog/pwm/fancontrol index c994af7c..4672e033 100755 --- a/prog/pwm/fancontrol +++ b/prog/pwm/fancontrol @@ -159,8 +159,11 @@ else LoadConfig /etc/fancontrol fi -# Detect if config file uses the hwmon class or not yet -if echo "${AFCPWM[0]}" | egrep -q '^hwmon[0-9]' +# Detect path to sensors +if echo "${AFCPWM[0]}" | egrep -q '^/' +then + DIR=/ +elif echo "${AFCPWM[0]}" | egrep -q '^hwmon[0-9]' then DIR=/sys/class/hwmon else diff --git a/prog/pwm/fancontrol.8 b/prog/pwm/fancontrol.8 index aed490d4..c4574444 100644 --- a/prog/pwm/fancontrol.8 +++ b/prog/pwm/fancontrol.8 @@ -81,12 +81,12 @@ VARIABLE2=... .fi .PP Each variable has its own line. The variable name is followed by an equal sign -and the device=value pairs. These consist of the relative path to the pwm -output (from /sys/bus/i2c/devices or /sys/class/hwmon -depending on the kernel version) for which the value is valid, equal sign -followed by the value and are separated by a blank. Example: +and the device=value pairs. These consist of the path to the pwm output for +which the value is valid, equal sign followed by the value and are separated +by a blank. Path can be absolute or relative (from /sys/bus/i2c/devices or +/sys/class/hwmon depending on the kernel version). Example: .IP -MINTEMP=w83627hf-isa-0290/pwm2=40 w83627hf-isa-0290/pwm1=54 +MINTEMP=hwmon0/device/pwm1=40 hwmon0/device/pwm2=54 .PP You have to play with the temperature values a bit to get happy. For initial setup I recommend using the \fBpwmconfig\fP script. Small changes can be made by