X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fsensors.c;h=6106df39b9a149b8e3e0e30dc8803722dfcfbfd2;hb=24b87484c7fd2e0998682db6f77e54d8cdc459d4;hp=e467fd9061d05f29bc075ebcf6032a069af6cd96;hpb=1c9362a971d62d4278bb29beb07186d6d2b4f932;p=collectd.git diff --git a/src/sensors.c b/src/sensors.c index e467fd90..6106df39 100644 --- 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) && - (feature->type != SENSORS_FEATURE_HUMIDITY) && #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', " @@ -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) && - (subfeature->type != SENSORS_SUBFEATURE_HUMIDITY_INPUT) && #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; @@ -519,12 +523,14 @@ static int sensors_read(void) { 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 >= 0x431 + else if (fl->feature->type == SENSORS_FEATURE_HUMIDITY) + type = "humidity"; +#endif else continue;