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 ab54c6c..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;
@@ -226,10 +226,12 @@ psensor_value_to_str(unsigned int type, double value, int use_celcius)
                        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);
 
@@ -271,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 {