fixed type 'thresold' instead of 'threshold'

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

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index 79095b9..1ab82bd 100644 (file)
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -49,14 +49,14 @@ 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;
@@ -89,6 +89,8 @@ void psensor_values_resize(struct psensor *s, int new_size)
 void psensor_free(struct psensor *sensor)
 {
        if (sensor) {
+               log_debug("Cleanup %s", sensor->id);
+
                free(sensor->name);
                free(sensor->id);
 
@@ -203,9 +205,13 @@ double celcius_to_fahrenheit(double c)
        return c * (9.0/5.0) + 32;
 }
 
-char *psensor_value_to_string(unsigned int type,
-                             double value,
-                             int use_celcius)
+double fahrenheit_to_celcius(double f)
+{
+       return (f - 32) * (5.0/9.0);
+}
+
+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 */
@@ -215,21 +221,31 @@ char *psensor_value_to_string(unsigned int type,
 
        if (is_temp_type(type))
                if (use_celcius) {
-                       unit = "C";
+                       unit = "°C";
                } else {
-                       unit = "F";
+                       unit = "°F";
                        value = celcius_to_fahrenheit(value);
                }
+       else if (is_fan_type(type))
+               unit = _("RPM");
        else if (type & SENSOR_TYPE_CPU_USAGE)
-               unit = "%";
+               unit = _("%");
        else
-               unit = "";
+               unit = _("N/A");
 
        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;
@@ -248,7 +264,7 @@ psensor_set_current_measure(struct psensor *s,
                &s->measures[1],
                (s->values_max_length - 1) * sizeof(struct measure));
 
-       s->measures[s->values_max_length - 1].value.d_num = v;
+       s->measures[s->values_max_length - 1].value = v;
        s->measures[s->values_max_length - 1].time = tv;
 
        if (s->min == UNKNOWN_DBL_VALUE || v < s->min)
@@ -257,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 {
@@ -272,7 +287,7 @@ psensor_set_current_measure(struct psensor *s,
 
 double psensor_get_current_value(struct psensor *sensor)
 {
-       return sensor->measures[sensor->values_max_length - 1].value.d_num;
+       return sensor->measures[sensor->values_max_length - 1].value;
 }
 
 struct measure *psensor_get_current_measure(struct psensor *sensor)
@@ -297,7 +312,7 @@ double get_min_value(struct psensor **sensors, int type)
                        double t;
 
                        for (i = 0; i < sensor->values_max_length; i++) {
-                               t = sensor->measures[i].value.d_num;
+                               t = sensor->measures[i].value;
 
                                if (t == UNKNOWN_DBL_VALUE)
                                        continue;
@@ -328,7 +343,7 @@ double get_max_value(struct psensor **sensors, int type)
                        int i;
                        double t;
                        for (i = 0; i < sensor->values_max_length; i++) {
-                               t = sensor->measures[i].value.d_num;
+                               t = sensor->measures[i].value;
 
                                if (t == UNKNOWN_DBL_VALUE)
                                        continue;
@@ -453,9 +468,9 @@ const char *psensor_type_to_unit_str(unsigned int type, int use_celcius)
 {
        if (type & SENSOR_TYPE_TEMP) {
                if (use_celcius)
-                       return _("C");
+                       return "\302\260C";
                else
-                       return _("F");
+                       return "\302\260F";
        }
 
        if (type & SENSOR_TYPE_FAN)
@@ -464,7 +479,7 @@ const char *psensor_type_to_unit_str(unsigned int type, int use_celcius)
        if (type & SENSOR_TYPE_CPU_USAGE)
                return _("%");
 
-       return "N/A";
+       return _("N/A");
 }
 
 void psensor_list_update_measures(struct psensor **sensors)
@@ -485,6 +500,18 @@ void psensor_list_update_measures(struct psensor **sensors)
 #endif
 }
 
+void psensor_log_measures(struct psensor **sensors)
+{
+       if (log_level == LOG_DEBUG)
+               while (*sensors) {
+                       log_debug("Measure: %s %.2f",
+                                  (*sensors)->name,
+                                  psensor_get_current_value(*sensors));
+
+                       sensors++;
+               }
+}
+
 void psensor_init()
 {
        lmsensor_init();