X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.c;h=de726e4d9c1b761eedebe122bfc9e28848aceb95;hb=1aee50e91aad2a7e84bed3c72ec8f4007e334039;hp=141779e3717d3cda6ac5f548ce89e954bc181d02;hpb=361e0eb40ee75b8eefebf5c75146531d2e2cf612;p=psensor.git diff --git a/src/lib/psensor.c b/src/lib/psensor.c index 141779e..de726e4 100644 --- a/src/lib/psensor.c +++ b/src/lib/psensor.c @@ -396,30 +396,30 @@ struct psensor **get_all_sensors(int values_max_length) const char *psensor_type_to_str(unsigned int type) { - if (type & SENSOR_TYPE_REMOTE) - return "Remote"; - - if (type & SENSOR_TYPE_LMSENSOR_TEMP) - return "Temperature"; - - if (type & SENSOR_TYPE_LMSENSOR_FAN) - return "Fan"; - - if (type & SENSOR_TYPE_NVIDIA_TEMP) + if ((type & SENSOR_TYPE_NVIDIA_TEMP) == SENSOR_TYPE_NVIDIA_TEMP) return "NVidia GPU Temperature"; - if (type & SENSOR_TYPE_AMD_TEMP) + if ((type & SENSOR_TYPE_AMD_TEMP) == SENSOR_TYPE_AMD_TEMP) return "AMD GPU Temperature"; - if (type & SENSOR_TYPE_AMD_FAN) + if ((type & SENSOR_TYPE_AMD_FAN) == SENSOR_TYPE_AMD_FAN) return "AMD GPU Fan Speed"; - if (type & SENSOR_TYPE_HDD_TEMP) + if ((type & SENSOR_TYPE_HDD_TEMP) == SENSOR_TYPE_HDD_TEMP) return "HDD Temperature"; if (type & SENSOR_TYPE_CPU_USAGE) return "CPU Usage"; + if (type & SENSOR_TYPE_TEMP) + return "Temperature"; + + if (type & SENSOR_TYPE_FAN) + return "Fan"; + + if (type & SENSOR_TYPE_REMOTE) + return "Remote"; + return "N/A"; /* should not be possible */ }