X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.h;h=8f9e7f7c55c8ba8ca52dba5560cb33a964951c17;hb=c1e20f2631a1249720e9c75d753eacfcb0f6c7b9;hp=08a3c2fde0cd73ca58e39dbdb79988ab61356a1e;hpb=60f6135a421095b240b984898e555df284f3b77f;p=psensor.git

diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index 08a3c2f..8f9e7f7 100644
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2014 jeanfi@gmail.com
+ * Copyright (C) 2010-2016 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -21,16 +21,10 @@
 
 #include <config.h>
 
-#ifdef HAVE_ATASMART
-#include <atasmart.h>
-#endif
-
 #include <bool.h>
-#include <color.h>
 #include <measure.h>
 #include <plog.h>
 
-
 enum psensor_type {
 	/* type of sensor values */
 	SENSOR_TYPE_TEMP = 0x00001,
@@ -48,6 +42,7 @@ enum psensor_type {
 	SENSOR_TYPE_ATASMART = 0x01000,
 	SENSOR_TYPE_HDDTEMP = 0x02000,
 	SENSOR_TYPE_UDISKS2 = 0x800000,
+	SENSOR_TYPE_BCM2835 = 0x1000000,
 
 	/* Type of HW component */
 	SENSOR_TYPE_HDD = 0x04000,
@@ -79,33 +74,30 @@ struct psensor {
 	/* 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;
+
+	/* The lowest value detected during this session. */
+	double sess_lowest;
 
-	int alarm_high_threshold;
-	int alarm_low_threshold;
+	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;
@@ -114,16 +106,9 @@ struct psensor {
 	/* 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,
@@ -139,8 +124,6 @@ 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);
 
@@ -152,10 +135,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.
  *
@@ -170,8 +149,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);