Commit Graph
701 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
Darrick J. Wong bb840c486c Subject: [PATCH 1/3 v3] libsensors: Support energy and power meters
Add power and sensor meters to libsensors, with minor tweaks and
documentation updates as suggested by Jean Delvare.

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@5183 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-04-17 01:27:22 +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 39b96fa477 Add support for virtual hwmon devices. This closes Red Hat bug #437637
and ticket #2305.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5176 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-04-14 15:27:59 +00:00
Jean Delvare c84fd9820e We start at the end of the chip list, going backwards, and we want the
late compute statements to override the early ones (as documented in the
sensors.conf manual page), so we must stop as soon as any match is found.

This fixes Debian bug #474596:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=474596


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5175 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-04-11 20:41:31 +00:00
Jean Delvare 399410079f The configuration file is currently parsed in the locale set by the main
program using the library. This means that if the decimal separator
(defined in LC_NUMERIC) is not '.' the values in the compute lines are
truncated. This happens for example with sensors-applet and a French
locale.

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=469333

Parsing the configuration file in C locale fixes the problem.
Original patch from Aurelien Jarno.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5169 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-04-08 14:50:13 +00:00
Jean Delvare 24ee53d80e Use __func__ instead of __FUNCTION__. The former is standard, the latter
is not.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5134 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-03-05 07:44:16 +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 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 3af8a8e6b8 Prepare for release.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5114 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-01-28 17:47:23 +00:00
Jean Delvare 191ed0afa6 Fix previous commit.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5110 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-01-22 12:29:06 +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 7ab0e911cc Document the variable overriding mechanism (#2296).
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5107 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-01-19 10:20:45 +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 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 9815a9f31b Add support for drivers that place the hwmon attributes in the hwmon
class device directory rather than directly in the device directory.
The latter is what all drivers do at the moment, but in the long run
the former is preferred as it prevents attribute name collisions.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5093 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-01-05 15:20:13 +00:00
Jean Delvare 5af7917c1f Get the device type from the subsystem symlink, rather than
guessing it from how the device identifier looks like. For kernels
<= 2.6.17, we use the bus symlink instead. For kernels <= 2.6.11,
neither symlink exist so we fallback to the old type guessing
approach. It doesn't really matter as all hwmon devices were
i2c devices back then.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5092 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-01-05 12:31:55 +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 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 d04f1c7306 sensors.conf.eg: Fix voltage value references in compute statements. The
measured voltage value are now named inX_input, not just inX, but the
default configuration file was not properly updated to reflect this. This
caused errors to be displayed by "sensors" for the g520sm, lm80 and pc87366
chips. Reported by Aurelien Jarno.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5076 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-12-17 21:59:15 +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 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 67218f03c3 libsensors: No longer depend on libsysfs.
Instead, access sysfs directly, using 3 embedded helper
functions. My motivations for doing this are:
* As far as I know, libsysfs is no longer maintained.
* libsysfs does much more than we need. For example, when asking for a
device attribute list, libsysfs will read the contents and permissions
of all attributes. Not only does this waste CPU cycles per se, but in
the case of hwmon driver it also triggers register reads, which can be
slow for SMBus chips.
* libsysfs enforces the difference between devices and class devices,
while future changes will be easier if we can handle both types alike.



git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5067 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-12-10 13:30:22 +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
Jean Delvare da141f4699 Update the application writing guidelines:
* The drivers are no longer in this package.
* Drop all references to i2c, these aren't related to sensors per se and
belong elsewhere.
* Random updates, fix broken references, clarify some parts.
* Add references to the relevant manual pages.
* Drop references to freshmeat, they don't really help.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5056 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-12-02 13:25:16 +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 f1a894e4e1 No warnings about ld configuration for staged installations, as these
make no sense: we have no idea how the target system will be configured.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5047 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-11-26 13:54:31 +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
Jean Delvare 60c451b381 Release 3.0.0.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5038 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-11-24 13:32:18 +00:00
Jean Delvare c9ef1503a5 Fix MODULE_DIR usage.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5034 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-11-22 20:03:29 +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 9167754da4 Release 3.0.0-rc3.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4997 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-10-28 12:51:47 +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