projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.8' into master
[collectd.git]
/
src
/
sensors.c
diff --git
a/src/sensors.c
b/src/sensors.c
index
e467fd9
..
6106df3
100644
(file)
--- a/
src/sensors.c
+++ b/
src/sensors.c
@@
-365,10
+365,12
@@
static int sensors_load_conf(void) {
if ((feature->type != SENSORS_FEATURE_IN) &&
(feature->type != SENSORS_FEATURE_FAN) &&
(feature->type != SENSORS_FEATURE_TEMP) &&
if ((feature->type != SENSORS_FEATURE_IN) &&
(feature->type != SENSORS_FEATURE_FAN) &&
(feature->type != SENSORS_FEATURE_TEMP) &&
- (feature->type != SENSORS_FEATURE_HUMIDITY) &&
#if SENSORS_API_VERSION >= 0x402
(feature->type != SENSORS_FEATURE_CURR) &&
#endif
#if SENSORS_API_VERSION >= 0x402
(feature->type != SENSORS_FEATURE_CURR) &&
#endif
+#if SENSORS_API_VERSION >= 0x431
+ (feature->type != SENSORS_FEATURE_HUMIDITY) &&
+#endif
(feature->type != SENSORS_FEATURE_POWER)) {
DEBUG("sensors plugin: sensors_load_conf: "
"Ignoring feature `%s', "
(feature->type != SENSORS_FEATURE_POWER)) {
DEBUG("sensors plugin: sensors_load_conf: "
"Ignoring feature `%s', "
@@
-385,10
+387,12
@@
static int sensors_load_conf(void) {
if ((subfeature->type != SENSORS_SUBFEATURE_IN_INPUT) &&
(subfeature->type != SENSORS_SUBFEATURE_FAN_INPUT) &&
(subfeature->type != SENSORS_SUBFEATURE_TEMP_INPUT) &&
if ((subfeature->type != SENSORS_SUBFEATURE_IN_INPUT) &&
(subfeature->type != SENSORS_SUBFEATURE_FAN_INPUT) &&
(subfeature->type != SENSORS_SUBFEATURE_TEMP_INPUT) &&
- (subfeature->type != SENSORS_SUBFEATURE_HUMIDITY_INPUT) &&
#if SENSORS_API_VERSION >= 0x402
(subfeature->type != SENSORS_SUBFEATURE_CURR_INPUT) &&
#endif
#if SENSORS_API_VERSION >= 0x402
(subfeature->type != SENSORS_SUBFEATURE_CURR_INPUT) &&
#endif
+#if SENSORS_API_VERSION >= 0x431
+ (subfeature->type != SENSORS_SUBFEATURE_HUMIDITY_INPUT) &&
+#endif
(subfeature->type != SENSORS_SUBFEATURE_POWER_INPUT))
continue;
(subfeature->type != SENSORS_SUBFEATURE_POWER_INPUT))
continue;
@@
-519,12
+523,14
@@
static int sensors_read(void) {
type = "temperature";
else if (fl->feature->type == SENSORS_FEATURE_POWER)
type = "power";
type = "temperature";
else if (fl->feature->type == SENSORS_FEATURE_POWER)
type = "power";
- else if (fl->feature->type == SENSORS_FEATURE_HUMIDITY)
- type = "humidity";
#if SENSORS_API_VERSION >= 0x402
else if (fl->feature->type == SENSORS_FEATURE_CURR)
type = "current";
#endif
#if SENSORS_API_VERSION >= 0x402
else if (fl->feature->type == SENSORS_FEATURE_CURR)
type = "current";
#endif
+#if SENSORS_API_VERSION >= 0x431
+ else if (fl->feature->type == SENSORS_FEATURE_HUMIDITY)
+ type = "humidity";
+#endif
else
continue;
else
continue;