X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.h;h=bfefefb01a1c4e09d80e66b334030ec1df8e22c0;hb=475b3f68b5fea9bd1d488c0ae88c95579494365c;hp=be25b72a3594c1ef6c6d3a5682635fd138c35df8;hpb=bd91336e936545a058781b20ba7af9f96f29e481;p=psensor.git

diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index be25b72..bfefefb 100644
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -19,17 +19,11 @@
 #ifndef _PSENSOR_PSENSOR_H_
 #define _PSENSOR_PSENSOR_H_
 
-#include <sensors/sensors.h>
+#include <config.h>
 
-#include "config.h"
-#ifdef HAVE_ATASMART
-#include <atasmart.h>
-#endif
-
-#include "bool.h"
-#include "color.h"
+#include <bool.h>
+#include <measure.h>
 #include <plog.h>
-#include "measure.h"
 
 enum psensor_type {
 	/* type of sensor values */
@@ -76,63 +70,44 @@ struct psensor {
 	/* Name of the chip. */
 	char *chip;
 
-	/* lm-sensor */
-	const sensors_chip_name *iname;
-
-	const sensors_feature *feature;
-
 	/* Maximum length of 'values' */
 	int values_max_length;
 
-	/* Last registered measures of the sensor.  Index 0 for the
-	 * oldest measure.  */
+	/*
+	 * Last registered measures of the sensor.  Index 0 for the
+	 * oldest measure.
+	 */
 	struct measure *measures;
 
-	/* Color of the sensor used for the graph */
-	struct color *color;
-
-	/* Whether the graph sensor is displayed. */
-	bool graph_enabled;
-
 	/* see psensor_type */
 	unsigned int type;
 
-	/* The maximum detected value of the sensor */
 	double max;
 
-	/* The minimum detected value of the sensor */
 	double min;
 
-	/* Whether alarm alert is enabled for this sensor */
-	bool alarm_enabled;
+	/* The highest value detected during this session. */
+	double sess_highest;
 
-	int alarm_high_threshold;
-	int alarm_low_threshold;
+	/* The lowest value detected during this session. */
+	double sess_lowest;
+
+	double alarm_high_threshold;
+	double alarm_low_threshold;
 
 	/* Whether an alarm is raised for this sensor */
-	unsigned int alarm_raised;
+	bool alarm_raised;
 
 	void (*cb_alarm_raised)(struct psensor *, void *);
 	void *cb_alarm_raised_data;
 
-#ifdef HAVE_NVIDIA
-	/* Nvidia id for the nvctrl */
-	int nvidia_id;
-#endif
 #ifdef HAVE_LIBATIADL
 	/* AMD id for the aticonfig */
 	int amd_id;
 #endif
-#ifdef HAVE_ATASMART
-	SkDisk *disk;
-#endif
 
 	void *provider_data;
 	void (*provider_data_free_fct)(void *);
-
-	char *url;
-
-	bool appindicator_enabled;
 };
 
 struct psensor *psensor_create(char *id,
@@ -148,15 +123,9 @@ void psensor_free(struct psensor *sensor);
 void psensor_list_free(struct psensor **sensors);
 int psensor_list_size(struct psensor **sensors);
 
-struct psensor **psensor_list_filter_graph_enabled(struct psensor **);
-
 struct psensor *psensor_list_get_by_id(struct psensor **sensors,
 				       const char *id);
 
-/* Return true if there is at least one sensor of a given type, else
- * returns false */
-bool psensor_list_contains_type(struct psensor **sensors, unsigned int type);
-
 int is_temp_type(unsigned int type);
 
 double get_min_temp(struct psensor **sensors);
@@ -165,10 +134,6 @@ double get_max_temp(struct psensor **sensors);
 double get_min_rpm(struct psensor **sensors);
 double get_max_rpm(struct psensor **sensors);
 
-/* Get the maximal current value of all sensors of a given type. */
-double
-psensor_get_max_current_value(struct psensor **sensors, unsigned int type);
-
 /*
  * Converts the value of a sensor to a string.
  *
@@ -183,8 +148,6 @@ char *psensor_measure_to_str(const struct measure *m,
 			     unsigned int type,
 			     unsigned int use_celsius);
 
-struct psensor **get_all_sensors(int use_libatasmart, int values_max_length);
-
 struct psensor **psensor_list_add(struct psensor **sensors,
 				  struct psensor *sensor);