X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.c;h=abacd9f4240ae49e8b0b2c5ee08bb08b86750f4f;hb=b0fbaa0cc4cdc38bc86e3739e5bc78d73ca063ec;hp=ce44a566252ee412e949d2d802f0f83430ee52e7;hpb=e1f8d2cbf6c09da9cbcb0bdf04d495b3d3666178;p=psensor.git

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index ce44a56..abacd9f 100644
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -50,8 +50,8 @@ struct psensor *psensor_create(char *id, char *name,
 	psensor->measures = measures_dbl_create(values_max_length);
 
 	psensor->alarm_enabled = 0;
-	psensor->alarm_high_thresold = 0;
-	psensor->alarm_low_thresold = 0;
+	psensor->alarm_high_threshold = 0;
+	psensor->alarm_low_threshold = 0;
 
 	psensor->cb_alarm_raised = NULL;
 	psensor->cb_alarm_raised_data = NULL;
@@ -61,6 +61,8 @@ struct psensor *psensor_create(char *id, char *name,
 
 	psensor->color = NULL;
 
+	psensor->appindicator_enabled = 0;
+
 	return psensor;
 }
 
@@ -213,23 +215,16 @@ 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);
 
@@ -272,7 +267,7 @@ psensor_set_current_measure(struct psensor *s,
 		s->max = v;
 
 	if (s->alarm_enabled) {
-		if (v > s->alarm_high_thresold || v < s->alarm_low_thresold) {
+		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);
 
@@ -464,20 +459,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 "\302\260C";
 		else
 			return "\302\260F";
-	}
-
-	if (type & SENSOR_TYPE_FAN)
+	} 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)