reorganization of the sensor type flags

[psensor.git] / src / lib / psensor.c

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index 7853ddf..c028c5e 100644 (file)
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -32,14 +32,18 @@
 #endif
 
 
-struct psensor *psensor_create(char *id, char *name,
-                              unsigned int type, int values_max_length)
+struct psensor *psensor_create(char *id,
+                              char *name,
+                              char *chip,
+                              unsigned int type,
+                              int values_max_length)
 {
        struct psensor *psensor
            = (struct psensor *)malloc(sizeof(struct psensor));
 
        psensor->id = id;
        psensor->name = name;
+       psensor->chip = chip;
        psensor->enabled = 1;
        psensor->min = UNKNOWN_DBL_VALUE;
        psensor->max = UNKNOWN_DBL_VALUE;
@@ -61,6 +65,8 @@ struct psensor *psensor_create(char *id, char *name,
 
        psensor->color = NULL;
 
+       psensor->appindicator_enabled = 0;
+
        return psensor;
 }
 
@@ -94,6 +100,9 @@ void psensor_free(struct psensor *sensor)
                free(sensor->name);
                free(sensor->id);
 
+               if (sensor->chip)
+                       free(sensor->chip);
+
                if (sensor->color)
                        free(sensor->color);
 
@@ -224,6 +233,9 @@ psensor_value_to_str(unsigned int type, double value, int use_celcius)
 
        unit = psensor_type_to_unit_str(type, use_celcius);
 
+       if (!use_celcius)
+               value = celcius_to_fahrenheit(value);
+
        sprintf(str, "%.0f%s", value, unit);
 
        return str;
@@ -393,7 +405,7 @@ double get_max_temp(struct psensor **sensors)
 
 struct psensor **get_all_sensors(int use_libatasmart, int values_max_length)
 {
-       struct psensor **psensors = NULL;
+       struct psensor **psensors;
        struct psensor **tmp_psensors;
 
        psensors = lmsensor_psensor_list_add(NULL, values_max_length);
@@ -427,19 +439,22 @@ struct psensor **get_all_sensors(int use_libatasmart, int values_max_length)
 
 const char *psensor_type_to_str(unsigned int type)
 {
-       if ((type & SENSOR_TYPE_NVIDIA_TEMP) == SENSOR_TYPE_NVIDIA_TEMP)
-               return "NVidia GPU Temperature";
+       if (type & SENSOR_TYPE_NVCTRL)
+               return "NVidia GPU";
 
-       if ((type & SENSOR_TYPE_AMD_TEMP) == SENSOR_TYPE_AMD_TEMP)
-               return "AMD GPU Temperature";
-
-       if ((type & SENSOR_TYPE_AMD_FAN) == SENSOR_TYPE_AMD_FAN)
-               return "AMD GPU Fan Speed";
+       if (type & SENSOR_TYPE_ATIADL) {
+               if (type & SENSOR_TYPE_TEMP)
+                       return "AMD GPU Temperature";
+               else if (type & SENSOR_TYPE_RPM)
+                       return "AMD GPU Fan Speed";
+               else /* type & SENSOR_TYPE_USAGE */
+                       return "AMD GPU Usage";
+       }
 
        if ((type & SENSOR_TYPE_HDD_TEMP) == SENSOR_TYPE_HDD_TEMP)
                return "HDD Temperature";
 
-       if (type & SENSOR_TYPE_CPU_USAGE)
+       if ((type & SENSOR_TYPE_CPU_USAGE) == SENSOR_TYPE_CPU_USAGE)
                return "CPU Usage";
 
        if (type & SENSOR_TYPE_TEMP)
@@ -448,10 +463,13 @@ const char *psensor_type_to_str(unsigned int type)
        if (type & SENSOR_TYPE_FAN)
                return "Fan";
 
+       if (type & SENSOR_TYPE_CPU)
+               return "CPU";
+
        if (type & SENSOR_TYPE_REMOTE)
                return "Remote";
 
-       return "N/A";           /* should not be possible */
+       return "N/A";
 }
 
 
@@ -479,12 +497,11 @@ void psensor_list_update_measures(struct psensor **sensors)
        cpu_psensor_list_update(sensors);
 #endif
 
-       if (psensor_list_contains_type(sensors, SENSOR_TYPE_HDD_TEMP_HDDTEMP))
+       if (psensor_list_contains_type(sensors, SENSOR_TYPE_HDDTEMP))
                hddtemp_psensor_list_update(sensors);
 
 #ifdef HAVE_ATASMART
-       if (psensor_list_contains_type(sensors,
-                                      SENSOR_TYPE_HDD_TEMP_ATASMART))
+       if (psensor_list_contains_type(sensors, SENSOR_TYPE_ATASMART))
                hdd_psensor_list_update(sensors);
 #endif
 }