From: Sarah Fischmann <sfischmann@starry.com>
Date: Wed, 29 Aug 2018 17:00:40 +0000 (-0400)
Subject: add humidity for lm_sensors version >= 0x402
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=fd072bf31a258b1997a40e6444d2d2814a3b23e7;p=collectd.git

add humidity for lm_sensors version >= 0x402
---

diff --git a/src/sensors.c b/src/sensors.c
index e467fd90..6d51101c 100644
--- a/src/sensors.c
+++ b/src/sensors.c
@@ -365,9 +365,9 @@ 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) &&
+          (feature->type != SENSORS_FEATURE_HUMIDITY) &&
 #endif
           (feature->type != SENSORS_FEATURE_POWER)) {
         DEBUG("sensors plugin: sensors_load_conf: "
@@ -385,9 +385,9 @@ 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) &&
+            (subfeature->type != SENSORS_SUBFEATURE_HUMIDITY_INPUT) &&
 #endif
             (subfeature->type != SENSORS_SUBFEATURE_POWER_INPUT))
           continue;
@@ -519,11 +519,11 @@ 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";
+    else if (fl->feature->type == SENSORS_FEATURE_HUMIDITY)
+      type = "humidity";
 #endif
     else
       continue;