X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fpsensor.c;h=f8c0a83a79a367d2ce6ec8eade3df2d30b46273a;hb=dd9cbee87e002a9954d5f9dd743311cccd4cedef;hp=9073d1222d7b85ac8d409ddc5ac9bb06099c0efd;hpb=de58b641143d1fb9622fa4021c2dd1ab50149dee;p=psensor.git

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index 9073d12..f8c0a83 100644
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -42,8 +42,16 @@ struct psensor *psensor_create(char *id,
 	psensor->id = id;
 	psensor->name = name;
 	psensor->chip = chip;
-	psensor->min = UNKNOWN_DBL_VALUE;
-	psensor->max = UNKNOWN_DBL_VALUE;
+	psensor->sess_lowest = UNKNOWN_DBL_VALUE;
+	psensor->sess_highest = UNKNOWN_DBL_VALUE;
+
+	if (type & SENSOR_TYPE_PERCENT) {
+		psensor->min = 0;
+		psensor->max = 100;
+	} else {
+		psensor->min = UNKNOWN_DBL_VALUE;
+		psensor->max = UNKNOWN_DBL_VALUE;
+	}
 
 	psensor->type = type;
 
@@ -247,11 +255,11 @@ void psensor_set_current_measure(struct psensor *s, double v, struct timeval tv)
 	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)
-		s->min = v;
+	if (s->sess_lowest == UNKNOWN_DBL_VALUE || v < s->sess_lowest)
+		s->sess_lowest = v;
 
-	if (s->max == UNKNOWN_DBL_VALUE || v > s->max)
-		s->max = v;
+	if (s->sess_highest == UNKNOWN_DBL_VALUE || v > s->sess_highest)
+		s->sess_highest = v;
 
 	if (v > s->alarm_high_threshold || v < s->alarm_low_threshold) {
 		if (!s->alarm_raised && s->cb_alarm_raised) {
@@ -274,8 +282,8 @@ struct measure *psensor_get_current_measure(struct psensor *sensor)
 }
 
 /*
-  Returns the minimal value of a given 'type' (SENSOR_TYPE_TEMP or
-  SENSOR_TYPE_FAN)
+ * Returns the minimal value of a given 'type' (SENSOR_TYPE_TEMP or
+ * SENSOR_TYPE_FAN)
  */
 static double get_min_value(struct psensor **sensors, int type)
 {
@@ -306,8 +314,8 @@ static double get_min_value(struct psensor **sensors, int type)
 }
 
 /*
-  Returns the maximal value of a given 'type' (SENSOR_TYPE_TEMP or
-  SENSOR_TYPE_FAN)
+ * Returns the maximal value of a given 'type' (SENSOR_TYPE_TEMP or
+ * SENSOR_TYPE_FAN)
  */
 double get_max_value(struct psensor **sensors, int type)
 {
@@ -424,7 +432,10 @@ const char *psensor_type_to_unit_str(unsigned int type, int use_celsius)
 
 void psensor_log_measures(struct psensor **sensors)
 {
-	if (log_level == LOG_DEBUG)
+	if (log_level == LOG_DEBUG) {
+		if (!sensors)
+			return;
+
 		while (*sensors) {
 			log_debug("Measure: %s %.2f",
 				   (*sensors)->name,
@@ -432,6 +443,7 @@ void psensor_log_measures(struct psensor **sensors)
 
 			sensors++;
 		}
+	}
 }
 
 struct psensor **psensor_list_copy(struct psensor **sensors)