X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.h;h=8d798e54b5427ead72753721011c71510ae22d4b;hb=94cd6e094ffb603809880f854a71dcef093257e5;hp=cd44106b816c0892e8b3cad951fc1235f36738ff;hpb=a57708401519afe0a8dce1a9704db1af1cc8f10d;p=psensor.git

diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index cd44106..8d798e5 100644
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -84,18 +84,12 @@ struct psensor {
 	/* The minimum detected value of the sensor */
 	double min;
 
-	/*
-	   Whether alarm alerts is enabled for this sensor
-	 */
-	int alarm_enabled;
-
-	/*
-	   An alarm is raised if the current sensor value is bigger. 0
-	   means no limit
-	 */
-	double alarm_limit;
-
-	/* Whether the current value is bigger than 'alarm_limit'.  */
+	/* Whether alarm alert is enabled for this sensor */
+	unsigned int alarm_enabled;
+
+	int alarm_high_thresold;
+
+	/* Whether the current value is bigger than 'alarm_high_thresold'. */
 	int alarm_raised;
 
 	void (*cb_alarm_raised) (struct psensor *, void *);
@@ -156,9 +150,13 @@ psensor_get_max_current_value(struct psensor **sensors, unsigned int type);
   parameter 'type' is SENSOR_TYPE_LMSENSOR_TEMP, SENSOR_TYPE_NVIDIA,
   or SENSOR_TYPE_LMSENSOR_FAN
 */
-char *psensor_value_to_string(unsigned int type,
-			      double value,
-			      int use_celcius);
+char *psensor_value_to_str(unsigned int type,
+			   double value,
+			   int use_celcius);
+
+char *psensor_measure_to_str(const struct measure *m,
+			     unsigned int type,
+			     unsigned int use_celcius);
 
 struct psensor **get_all_sensors(int use_libatasmart, int values_max_length);
 
@@ -189,5 +187,9 @@ void psensor_cleanup();
 double get_max_value(struct psensor **sensors, int type);
 
 double celcius_to_fahrenheit(double c);
+double fahrenheit_to_celcius(double c);
+
+
+void psensor_log_measures(struct psensor **sensors);
 
 #endif