Commit Graph
415 Commits
Author SHA1 Message Date
Matthew Tiffany 1b36ea4299 Added feature to sensors to allow json output.
* Added -j option to sensors that outputs json.
* -j option overrides raw option

Signed-off-by: Matthew SL Tiffany <shadethedemon@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
2017-04-14 08:03:49 -07:00
Jean Delvare 991c8d5f9a sensors.1: Add reference to sensors-detect
Contributed by Aurelien Jarno.
2015-08-10 08:23:41 +00:00
Jean Delvare 69b3b10fa6 sensors: Add support for temp[1-*]_min_hyst and temp[1-*]_lcrit_hyst 2014-04-22 08:09:29 +00:00
Jean Delvare eb5cf8b2ec Update my e-mail address and copyright years 2014-03-20 10:23:35 +00:00
Jean Delvare da18d98522 Spelling fixes from Ville Skyttä 2014-01-19 15:59:11 +00:00
Jean Delvare f915436019 sensors: Clarify what option -u is good for.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@6090 7894878c-1315-0410-8ee3-d5d059ff63e0
2012-11-12 09:35:59 +00:00
Jean Delvare 717e87b4d2 Fix % in format.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@6086 7894878c-1315-0410-8ee3-d5d059ff63e0
2012-11-06 19:44:01 +00:00
Jean Delvare 6a2798ccc0 sensors/man - missing long switches
Patch from Jaromir Capik.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@6076 7894878c-1315-0410-8ee3-d5d059ff63e0
2012-10-22 11:51:27 +00:00
Guenter Roeck 4726e44ab8 sensors: add humidity data to output of sensors command
Patch provided by Iain Paton.



git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@6070 7894878c-1315-0410-8ee3-d5d059ff63e0
2012-09-11 19:05:10 +00:00
Jean Delvare 69eb49cb7f sensors: Fix libiconv linkage need detection in rare corner case.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@6044 7894878c-1315-0410-8ee3-d5d059ff63e0
2012-04-19 13:13:27 +00:00
Guenter Roeck 107829d11d Fix power interval output
Power interval is measured in seconds, not Watt.



git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@6030 7894878c-1315-0410-8ee3-d5d059ff63e0
2012-03-07 16:12:56 +00:00
Jean Delvare a3e40509e0 Add support for fan[1-*]_max, fan[1-*]_min_alarm and fan[1-*]_max_alarm
attributes. These are defined in the standard sysfs interface for quite
some time, and at least three drivers (max6650, lm63 and applesmc)
implement them so we should support them.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@6029 7894878c-1315-0410-8ee3-d5d059ff63e0
2012-03-06 07:34:13 +00:00
Jean Delvare ffa146909c sensors: Align power values better.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@6011 7894878c-1315-0410-8ee3-d5d059ff63e0
2012-01-13 09:41:36 +00:00
Jean Delvare cd2ff28d7b sensors: Report thermal sensor type 1 as CPU diode.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@6010 7894878c-1315-0410-8ee3-d5d059ff63e0
2012-01-13 08:48:55 +00:00
Guenter Roeck f8b6670e56 sensors: Display both instantaneous and average power
Some sensor chips report both instantaneous and average power.
Add support to display both.



git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@6008 7894878c-1315-0410-8ee3-d5d059ff63e0
2012-01-09 18:24:03 +00:00
Guenter Roeck 273102f2c9 Add support for additional sysfs attributes to libsensors and to sensors command
inX_average
inX_lowest
inX_highest
tempX_lowest
tempX_highest
currX_average
currX_lowest
currX_highest




git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@6007 7894878c-1315-0410-8ee3-d5d059ff63e0
2012-01-09 17:30:10 +00:00
Guenter Roeck 19fd8481b7 sensors: Use defines for array sizes
Use defines for array sizes. For alarm attributes, take into account that both
the generic alarm flag as well as individual alarm attributes may be provided
by a driver (even though that should not be the case).

Remove overflow checks from get_sensor_limit_data(), as overflows should
no longer happen.



git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@6006 7894878c-1315-0410-8ee3-d5d059ff63e0
2012-01-09 17:21:08 +00:00
Jean Delvare 5b0c174640 Ensure that hysteresis and the limit it relates to are always
printed on the same line.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5944 7894878c-1315-0410-8ee3-d5d059ff63e0
2011-03-16 21:31:25 +00:00
Guenter Roeck 57815ea1c7 sensors: Added support for additional sensor attributes
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5943 7894878c-1315-0410-8ee3-d5d059ff63e0
2011-03-16 17:23:33 +00:00
Guenter Roeck aea4b6cbe8 sensors: If an attribute value is 0, display the value with its base unit,
not with the minumum supported unit.



git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5942 7894878c-1315-0410-8ee3-d5d059ff63e0
2011-03-16 14:55:04 +00:00
Jean Delvare db88ea2698 sensors: Add support for intrusion detection.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5880 7894878c-1315-0410-8ee3-d5d059ff63e0
2010-11-03 13:01:38 +00:00
Jean Delvare 2a0c688cb8 sensors: Display 3 decimal places in raw output.
This will make it easier for us to help users find out correct scaling
factors when needed. Instead of telling them to go read the raw sysfs
attributes, they can just report the output of "sensors -u -c /dev/null".


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5877 7894878c-1315-0410-8ee3-d5d059ff63e0
2010-11-03 11:59:55 +00:00
Jean Delvare 41a0981e28 Ensure there's at least one space between the label and the value.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5872 7894878c-1315-0410-8ee3-d5d059ff63e0
2010-11-02 12:37:35 +00:00
Jean Delvare 51e4710815 Properly handle read errors from sensor inputs. Report them as "N/A".
This happens with a couple drivers for devices with inputs which
can come and go.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5836 7894878c-1315-0410-8ee3-d5d059ff63e0
2010-05-23 09:04:13 +00:00
Jean Delvare 8416f31add Fix a build warning in set_degstr. The prototype of iconv() is
stupid but won't change so we have to live with it.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5801 7894878c-1315-0410-8ee3-d5d059ff63e0
2009-11-28 12:26:44 +00:00
Jean Delvare 78f496ca62 libsensors: New method to free the memory allocated for the internal
representation of chip names.
sensord, sensors: Fix a memory leak when one or more chip names are
provided on the command line.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5740 7894878c-1315-0410-8ee3-d5d059ff63e0
2009-06-20 10:04:52 +00:00
Jean Delvare e675ad35c9 Removed trailing semicolon in error string. Patch from Andre Prendel.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5632 7894878c-1315-0410-8ee3-d5d059ff63e0
2009-01-29 09:45:25 +00:00
Jean Delvare 6ed5aa3a0a Consistently use "err" as the variable name to carry error codes.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5628 7894878c-1315-0410-8ee3-d5d059ff63e0
2009-01-28 13:16:17 +00:00
Jean Delvare 496b15a644 Fix exit code in error case (for example no sensors found.) Patch from
Andre Prendel.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5627 7894878c-1315-0410-8ee3-d5d059ff63e0
2009-01-28 13:10:21 +00:00
Jean Delvare 51a621be43 Add support for current sensors.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5379 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-10-24 09:04:26 +00:00
Jean Delvare d766935c47 Add support for instantaneous power sensors.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5378 7894878c-1315-0410-8ee3-d5d059ff63e0
2008-10-24 09:03:18 +00:00
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 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
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 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 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
Jean Delvare 2b650945f1 sensors: Handle the case where voltage measurements aren't available.
This will soon be the case of the Linux 2.6 gl518sm driver.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4977 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-10-22 18:27:04 +00:00
Jean Delvare 2b1c2a0e6f sensors: Fix file handle leak on library initialization error.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4973 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-10-21 14:31:38 +00:00
Jean Delvare e012d14d95 sensors: Better handling of the fault flags.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4910 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-09-30 17:56:19 +00:00
Jean Delvare 647b47cb6a Add my copyright everywhere it is missing.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4902 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-09-29 19:18:15 +00:00
Jean Delvare 855b1aa6ef The lm-sensors team has no legal existence and thus can't hold a copyright.
I tried to assign the copyright back to the original author where possible.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4900 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-09-29 19:08:30 +00:00
Jean Delvare fa1f1aef32 sensors: Make error messages more helpful and consistent.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4898 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-09-29 18:11:38 +00:00
Jean Delvare a269604853 sensors: Print error messages to stderr.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4897 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-09-29 14:31:07 +00:00
Jean Delvare 19b4cf5e37 Fix spurious critical temperature alarm.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4892 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-09-26 21:28:04 +00:00
Jean Delvare ab36c5b0f8 Delete unused SENSORS_ERR_ACCESS.
Rename SENSORS_ERR_PROC to the more neutral SENSORS_ERR_KERNEL.
Introduce SENSORS_ERR_NO_DEVS for finer-grained error reporting.
Use SENSORS_ERR_KERNEL and SENSORS_ERR_NO_DEVS where appropriate.
No error message for invalid error codes.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4854 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-09-23 13:53:11 +00:00
Jean Delvare 9698d82fd3 Rename sensors_get_label_size() to get_label_size() for consistency.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4847 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-09-23 12:33:12 +00:00
Jean Delvare e01466d993 New public library function: sensors_get_subfeature(). Applications can
use it to retrieve a specific subfeature by type. While it is slighly
less efficient than looping over sensors_get_all_subfeatures(), it
often makes the application code much more elegant.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4846 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-09-23 12:30:28 +00:00
Jean Delvare da7b4e48da Introduce a separate type for main features. Make subfeatures map to
the real main feature rather than the first subfeature.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@4838 7894878c-1315-0410-8ee3-d5d059ff63e0
2007-09-23 12:16:50 +00:00