Commit Graph
1359 Commits
Author SHA1 Message Date
Darrick J. Wong f4e4fcd8c1 Subject: [PATCH 3/3 v3]: sensors: Automatically scale energy/power units
Automatically scale energy and power values when printing them in cooked
mode.  Fixed all the warnings and warts that were brought up by Jean in
the previous thread.

Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>



git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5185 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-04-17 01:30:37 +00:00
Darrick J. Wong 4c93dffd4f Subject: [PATCH 3/4 v2] sensors: Print energy and power meters
Display power and energy meters in sensors.

Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>



git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5184 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-04-17 01:28:51 +00:00
Jean Delvare bcabe00237 Arbitrary version bump.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5182 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-04-16 18:35:46 +00:00
Jean Delvare 5db0d2003f Drop obsolete comment.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5181 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-04-16 18:22:12 +00:00
Jean Delvare 17e7247f28 pwmconfig: Don't start if fancontrol is running.
fancontrol: Don't start if already running, delete fancontrol.pid at
exit time.
This closes ticket #2299.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5180 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-04-16 14:29:01 +00:00
Jean Delvare be4ea8ac3e Don't create the configuration file before it's needed.
Don't preserve configuration file customizations.
Fix permissions of the configuration file.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5179 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-04-16 11:18:36 +00:00
Jean Delvare f2e518511d Patch from Aurelien Jarno:
I have just noticed that the FSF address is the old one in all files
except COPYING. Please find a patch below to fix that.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5163 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-03-26 13:37:12 +00:00
Hans de Goede afed959df6 modify initscript to have lsb compliant return values
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5144 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-03-12 20:50:34 +00:00
Hans de Goede d155421542 Modify initscript chkconfig comments to not make the service start by default, modify sensors-detect to enable the service on boot once configured and to start it at the end of sensors-detect
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5143 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-03-12 20:50:19 +00:00
Jean Delvare 70829b1594 New device ID for the SMSC SCH5317.
http://lists.lm-sensors.org/pipermail/lm-sensors/2008-February/022645.html


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5133 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-03-02 22:06:43 +00:00
Hans de Goede f702bcf551 run chip_special_cases() earlier so that the special chips get added to the modules_supported list
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5131 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-02-26 13:50:33 +00:00
Jean Delvare 5464d9e26e Minor string edit.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5128 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-02-21 08:21:20 +00:00
Jean Delvare 7f58258a1d Move south bridge sensor detection to the right section.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5126 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-02-20 19:31:34 +00:00
Jean Delvare 1dc288af38 Do not access I/O ports on PPC.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5124 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-02-20 19:05:00 +00:00
Jean Delvare 10f1901765 Add SMSC SCH5027D detection. Patch from Juerg Haefliger.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5117 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-02-03 21:03:07 +00:00
Jean Delvare 8f2142b76e Spelling fix.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5112 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-01-27 14:18:24 +00:00
Jean Delvare 04ae8141b8 MINPWM and MAXPWM may be undefined for a given PWM output.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5111 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-01-27 12:36:28 +00:00
Jean Delvare 134aa5bd3f Add Fintek F71858DG and F81216D detection.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5108 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-01-22 12:22:47 +00:00
Jean Delvare 3914365547 Fix duplicate warning message when configuration file is broken.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5103 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-01-09 11:01:44 +00:00
Jean Delvare 8d00528cd3 Detect improperly formatted FCTEMPS value (#2293).
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5102 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-01-09 10:59:48 +00:00
Jean Delvare e6c94c66ed Bash doesn't do lazy evaluation on test-like expressions, so don't
assume it does (#2292).


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5100 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-01-08 20:10:52 +00:00
Jean Delvare 936c5f66c2 Switch to SVN revision numbering, so that the version is always up-to-date.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5099 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-01-08 19:12:44 +00:00
Jean Delvare 7963e7cf13 Repeat available configuration options before prompt (#2289).
The code isn't very clean but that's the best I could come up with.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5098 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-01-08 19:02:40 +00:00
Jean Delvare 81a7fbdb22 Lower the confidence value of the MAX6650/MAX6651 from 4 to 3.
These chips are easily misdetected.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5097 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-01-06 14:14:25 +00:00
Jean Delvare 89b2310ff3 Add detection of the SMSC SCH5514 Super-IO. The chip doesn't contain
HW monitoring features. Patch from Juerg Haefliger.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5094 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-01-05 16:55:11 +00:00
Jean Delvare 7a2649483e Fix error path on library initialization error. Only call fclose() if
we have actually opened a configuration file before.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5090 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-01-05 09:14:28 +00:00
Jean Delvare 1cf9ea0c54 More system integration improvements:
* Call insserv on the lm_sensors service when present.
* No sleep before running sensors -s.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5084 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-12-19 22:36:13 +00:00
Jean Delvare 1b4d863eaa Add support for the 82801AA (ICH).
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5082 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-12-19 13:27:40 +00:00
Jean Delvare 8f18d66447 Improve sysconfig and modprobe.d integration, based on suggestions by
Gary Funck:
* If we create /etc/sysconfig/lm_sensors, there's no point in printing
  the modprobe commands on the screen.
* Otherwise, suggest /etc/rc.d/rc.local as the init script where to put
  the commands.
* If /etc/modprobe.d exists, create a file there to store the module
  options, rather than printing them on the screen.



git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5080 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-12-18 13:04:03 +00:00
Jean Delvare b029b8f861 sensord: Drop workaround needed by old versions of rrdtool. The bug
(missing getopt variables initialization) was fixed in rrdtool version
1.2.1, 2.5 years ago.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5072 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-12-11 22:56:47 +00:00
Jean Delvare 9dbde1cc06 Drop unneeded include.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5071 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-12-11 22:00:49 +00:00
Jean Delvare e257a45fed sensord: Use the same colors for daily and weekly charts.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5070 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-12-11 21:48:34 +00:00
Jean Delvare 4f8196934c sensord: Fix rrd support (#2276).
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5069 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-12-11 13:14:39 +00:00
Jean Delvare ce73cfb389 Fix typo. According to National's datasheet PC87317 has SID = 0xd0 and
PC97317 has SID = 0xdf. PC87371/PC97371 do not seem to exist.
Patch from Ulf Jordan.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5066 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-12-08 11:18:10 +00:00
Jean Delvare 9bf2d8c187 Warn about outputs found in automatic mode.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5063 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-12-04 10:21:16 +00:00
Jean Delvare 972e5e2f01 Really hide errors on sysfs writes.
Deal gracefully with read-only pwm_enable files.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5061 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-12-04 09:27:49 +00:00
Rudolf Marek 78f7214fbb Fix typo, model should be in hex.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5051 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-11-27 11:37:26 +00:00
Rudolf Marek d147525434 Add Intel Celeron 4xx and Intel Core 2 CPUs on 45nm (Penryn) detection.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5048 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-11-27 11:13:49 +00:00
Jean Delvare 48035c2161 Drop detection of the Philips Semiconductors PCA9540. This is an I2C
multiplexer, it should be handled transparently at the kernel level.
On top of that, it can't be detected reliably, and the pca9540 driver
doesn't even exist in Linux 2.6.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5045 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-11-26 13:01:30 +00:00
Hans de Goede 4075aa1660 Fix building on PPC machines
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5035 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-11-23 19:50:05 +00:00
Jean Delvare c0637bebe0 pwmconfig: Give the fans some time to spin up.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5025 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-11-18 16:16:41 +00:00
Jean Delvare a95f194cef pwmconfig: Better diagnostics in pwmdisable.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5023 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-11-18 16:01:04 +00:00
Jean Delvare 778c45136c Stop probing I2C addresses 0x20-0x27 for the LM78, LM79, W83781D and
W83782D chips. We've never seen any hardware monitoring chip at these
addresses. The correponding kernel drivers will be modified to no
longer probe these addresses either.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5016 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-11-11 21:20:16 +00:00
Jean Delvare 5c5da6df8b sensors-detect: Add SMSC LPC47B367-NC detection. We have no datasheet,
but this is a variant of the LPC47B357, and that one has no hardware
monitoring features, so for now we assume that the LPC47B367 has no
hardware monitoring features either.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5009 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-11-09 14:17:51 +00:00
Jean Delvare 6ece4889ce Mention the f75375s driver. Reported by Christian Emmerich.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5007 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-11-02 10:23:32 +00:00
Hans de Goede ce23228bbd sensors-detect: Add Texas Instruments TMP401 detection
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5000 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-10-28 14:20:53 +00:00
Jean Delvare 5b5b1bb3dc Install sensors as sensors again.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4991 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-10-25 10:57:14 +00:00
Jean Delvare 35a5a7dbce Use /etc/sensors3.conf as the default configuration file. If it can't
be found, fallback to /etc/sensors.conf. This allows for an old
libsensors and a new libsensors to be installed in parallel, and each
one has its own configuration file.

One important change here is that the default configuration file will
be installed as /etc/sensors3.conf by "make install".


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4990 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-10-25 09:59:05 +00:00
Jean Delvare 6d5292cce4 "sensord" no longer needs a default configuration file name. If no
file name is provided on the command line, use the libsensors default.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4987 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-10-25 09:50:17 +00:00
Jean Delvare f17e1cf5a8 "sensors" no longer needs a default configuration file name. If no
file name is provided on the command line, use the libsensors default.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4986 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-10-25 09:49:34 +00:00