fixed type 'thresold' instead of 'threshold'

[psensor.git] / src / lib / psensor.h

diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index cd44106..c9535b9 100644 (file)
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -72,8 +72,8 @@ struct psensor {
        /* Color of the sensor used for the graph */
        struct color *color;
 
-       /* Whether the sensor is displayed in the graph */
-       int enabled;
+       /* Whether the graph sensor is displayed. */
+       unsigned int enabled;
 
        /* see psensor_type */
        unsigned int type;
@@ -84,19 +84,14 @@ struct psensor {
        /* The minimum detected value of the sensor */
        double min;
 
-       /*
-          Whether alarm alerts is enabled for this sensor
-        */
-       int alarm_enabled;
+       /* Whether alarm alert is enabled for this sensor */
+       unsigned int alarm_enabled;
 
-       /*
-          An alarm is raised if the current sensor value is bigger. 0
-          means no limit
-        */
-       double alarm_limit;
+       int alarm_high_threshold;
+       int alarm_low_threshold;
 
-       /* Whether the current value is bigger than 'alarm_limit'.  */
-       int alarm_raised;
+       /* Whether an alarm is raised for this sensor */
+       unsigned int alarm_raised;
 
        void (*cb_alarm_raised) (struct psensor *, void *);
        void *cb_alarm_raised_data;
@@ -156,9 +151,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 +188,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