values are remotely retrieved
authorJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 22 Mar 2013 10:17:49 +0000 (10:17 +0000)
committerJean-Philippe Orsini <jeanfi@gmail.com>
Fri, 22 Mar 2013 10:17:49 +0000 (10:17 +0000)
src/lib/cpu.c
src/lib/hdd_atasmart.c
src/lib/hdd_hddtemp.c
src/lib/lmsensor.c

index 0fe66df..7cf2105 100644 (file)
@@ -93,7 +93,8 @@ void cpu_psensor_list_update(struct psensor **sensors)
        while (*ss) {
                s = *ss;
 
-               if (s->type == SENSOR_TYPE_CPU_USAGE)
+               if (!(s->type & SENSOR_TYPE_REMOTE)
+                   && s->type == SENSOR_TYPE_CPU_USAGE)
                        cpu_usage_sensor_update(s);
 
                ss++;
index acd4a8f..bd1ff4b 100644 (file)
@@ -169,7 +169,8 @@ void hdd_psensor_list_update(struct psensor **sensors)
        cur = sensors;
        while (*cur) {
                s = *cur;
-               if (s->type & SENSOR_TYPE_ATASMART) {
+               if (!(s->type & SENSOR_TYPE_REMOTE)
+                   && s->type & SENSOR_TYPE_ATASMART) {
                        ret = sk_disk_smart_read_data(s->disk);
 
                        if (!ret) {
index 9a6d3d3..afd57b4 100644 (file)
@@ -222,7 +222,8 @@ static void update(struct psensor **sensors, struct hdd_info *info)
        struct psensor **sensor_cur = sensors;
 
        while (*sensor_cur) {
-               if ((*sensor_cur)->type & SENSOR_TYPE_HDDTEMP
+               if (!((*sensor_cur)->type & SENSOR_TYPE_REMOTE)
+                   && (*sensor_cur)->type & SENSOR_TYPE_HDDTEMP
                    && !strcmp((*sensor_cur)->id + 4, info->name))
                        psensor_set_current_value(*sensor_cur,
                                                  (float)info->temp);
index 84b36b3..2ace110 100644 (file)
@@ -86,7 +86,8 @@ void lmsensor_psensor_list_update(struct psensor **sensors)
        while (*s_ptr) {
                struct psensor *s = *s_ptr;
 
-               if (s->type & SENSOR_TYPE_LMSENSOR) {
+               if (!(s->type & SENSOR_TYPE_REMOTE)
+                   && s->type & SENSOR_TYPE_LMSENSOR) {
                        if (s->type & SENSOR_TYPE_TEMP)
                                psensor_set_current_value(s,
                                                          get_temp_input(s));