X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.c;h=1ab82bd62a913eb96a32d7c0379e41fe0791129b;hb=633311cbd5621fefdc0373c5ee967a87925e5221;hp=ab54c6ce060b79adbfd82d87644bb0a91ece226b;hpb=f240b18344b1ce1dc674120383b5c7de9dc03a97;p=psensor.git

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index ab54c6c..1ab82bd 100644
--- 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 {