projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
next branch release will be v0.6.2.17
[psensor.git]
/
src
/
lib
/
psensor.c
diff --git
a/src/lib/psensor.c
b/src/lib/psensor.c
index
141779e
..
de726e4
100644
(file)
--- 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)
{
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";
return "NVidia GPU Temperature";
- if (
type &
SENSOR_TYPE_AMD_TEMP)
+ if (
(type & SENSOR_TYPE_AMD_TEMP) ==
SENSOR_TYPE_AMD_TEMP)
return "AMD GPU Temperature";
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";
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";
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 */
}
return "N/A"; /* should not be possible */
}