display the name of chip in sensor preferences.

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

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index b01c81b..c399544 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;
@@ -49,18 +53,20 @@ struct psensor *psensor_create(char *id, char *name,
        psensor->values_max_length = values_max_length;
        psensor->measures = measures_dbl_create(values_max_length);
 
-       psensor->alarm_limit = 0;
+       psensor->alarm_enabled = 0;
+       psensor->alarm_high_threshold = 0;
+       psensor->alarm_low_threshold = 0;
 
        psensor->cb_alarm_raised = NULL;
        psensor->cb_alarm_raised_data = NULL;
        psensor->alarm_raised = 0;
 
-       psensor->alarm_enabled = 0;
-
        psensor->url = NULL;
 
        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);
 
@@ -213,29 +222,30 @@ double fahrenheit_to_celcius(double f)
 char *
 psensor_value_to_str(unsigned int type, double value, int use_celcius)
 {
-       /* should not be possible to exceed 20 characters with temp or
-          rpm values the .x part is never displayed */
-       char *str = malloc(20);
+       char *str;
+       const char *unit;
 
-       char *unit;
+       /*
+        * should not be possible to exceed 20 characters with temp or
+        * rpm values the .x part is never displayed
+        */
+       str = malloc(20);
 
-       if (is_temp_type(type))
-               if (use_celcius) {
-                       unit = "°C";
-               } else {
-                       unit = "°F";
-                       value = celcius_to_fahrenheit(value);
-               }
-       else if (type & SENSOR_TYPE_CPU_USAGE)
-               unit = "%";
-       else
-               unit = "";
+       unit = psensor_type_to_unit_str(type, use_celcius);
 
        sprintf(str, "%.0f%s", value, unit);
 
        return str;
 }
 
+char *
+psensor_measure_to_str(const struct measure *m,
+                      unsigned int type,
+                      unsigned int use_celcius)
+{
+       return psensor_value_to_str(type, m->value, use_celcius);
+}
+
 void psensor_set_current_value(struct psensor *sensor, double value)
 {
        struct timeval tv;
@@ -263,11 +273,10 @@ psensor_set_current_measure(struct psensor *s,
        if (s->max == UNKNOWN_DBL_VALUE || v > s->max)
                s->max = v;
 
-       if (s->alarm_limit && s->alarm_enabled) {
-               if (v > s->alarm_limit) {
+       if (s->alarm_enabled) {
+               if (v > s->alarm_high_threshold || v < s->alarm_low_threshold) {
                        if (!s->alarm_raised && s->cb_alarm_raised)
-                               s->cb_alarm_raised(s,
-                                                  s->cb_alarm_raised_data);
+                               s->cb_alarm_raised(s, s->cb_alarm_raised_data);
 
                        s->alarm_raised = 1;
                } else {
@@ -457,20 +466,18 @@ const char *psensor_type_to_str(unsigned int type)
 
 const char *psensor_type_to_unit_str(unsigned int type, int use_celcius)
 {
-       if (type & SENSOR_TYPE_TEMP) {
+       if (is_temp_type(type)) {
                if (use_celcius)
-                       return _("°C");
+                       return "\302\260C";
                else
-                       return _("°F");
-       }
-
-       if (type & SENSOR_TYPE_FAN)
+                       return "\302\260F";
+       } else if (is_fan_type(type)) {
                return _("RPM");
-
-       if (type & SENSOR_TYPE_CPU_USAGE)
+       } else if (type & SENSOR_TYPE_CPU_USAGE) {
                return _("%");
-
-       return "N/A";
+       } else {
+               return _("N/A");
+       }
 }
 
 void psensor_list_update_measures(struct psensor **sensors)