- ret = XNVCTRLQueryTargetAttribute
- (display,
- NV_CTRL_TARGET_TYPE_COOLER,
- i,
- 0,
- NV_CTRL_THERMAL_COOLER_SPEED, &rpm);
- if (ret == True)
- log_debug("NVIDIA: fan speed %d %d", i, rpm);
- else
- log_err(_("NVIDIA: "
- "failed to retrieve fan speed %d"),
- i);
-
- ret = XNVCTRLQueryTargetAttribute
- (display,
- NV_CTRL_TARGET_TYPE_COOLER,
- i,
- 0,
- NV_CTRL_THERMAL_COOLER_LEVEL, &rpm);
- if (ret == True)
- log_debug("NVIDIA: fan level %d %d", i, rpm);
- else
- log_err(_("NVIDIA: "
- "failed to retrieve fan level %d"),
- i);
-
-
- add(&ss, i, SENSOR_TYPE_FAN, values_len);
+ utype = SENSOR_TYPE_FAN | SENSOR_TYPE_RPM;
+ if (check_sensor(i, utype))
+ add(ss, i, utype, values_len);
+
+ utype = SENSOR_TYPE_FAN | SENSOR_TYPE_PERCENT;
+ if (check_sensor(i, utype))
+ add(ss, i, utype, values_len);