X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.h;h=bfd7277bcd50d810c3f01b234432386506e73c66;hb=fa1395301c20b43c9b044fa08af3ceb17882fa6a;hp=f706bdefccbfef756287c1229aa9b5c05be5f790;hpb=b028afb4f41b141ee26e113b8b27f0d086dc8e1e;p=psensor.git

diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index f706bde..bfd7277 100644
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2014 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
@@ -28,14 +28,14 @@
 
 #include "bool.h"
 #include "color.h"
-#include "log.h"
+#include <plog.h>
 #include "measure.h"
 
 enum psensor_type {
 	/* type of sensor values */
 	SENSOR_TYPE_TEMP = 0x00001,
 	SENSOR_TYPE_RPM = 0x00002,
-	SENSOR_TYPE_USAGE = 0x00004,
+	SENSOR_TYPE_PERCENT = 0x00004,
 
 	/* Whether the sensor is remote */
 	SENSOR_TYPE_REMOTE = 0x00008,
@@ -47,6 +47,7 @@ enum psensor_type {
 	SENSOR_TYPE_ATIADL = 0x00800,
 	SENSOR_TYPE_ATASMART = 0x01000,
 	SENSOR_TYPE_HDDTEMP = 0x02000,
+	SENSOR_TYPE_UDISKS2 = 0x800000,
 
 	/* Type of HW component */
 	SENSOR_TYPE_HDD = 0x04000,
@@ -54,9 +55,15 @@ enum psensor_type {
 	SENSOR_TYPE_GPU = 0x10000,
 	SENSOR_TYPE_FAN = 0x20000,
 
+	SENSOR_TYPE_GRAPHICS = 0x40000,
+	SENSOR_TYPE_VIDEO = 0x80000,
+	SENSOR_TYPE_PCIE = 0x100000,
+	SENSOR_TYPE_MEMORY = 0x200000,
+	SENSOR_TYPE_AMBIENT = 0x400000,
+
 	/* Combinations */
 	SENSOR_TYPE_HDD_TEMP = (SENSOR_TYPE_HDD | SENSOR_TYPE_TEMP),
-	SENSOR_TYPE_CPU_USAGE = (SENSOR_TYPE_CPU | SENSOR_TYPE_USAGE)
+	SENSOR_TYPE_CPU_USAGE = (SENSOR_TYPE_CPU | SENSOR_TYPE_PERCENT)
 };
 
 struct psensor {
@@ -71,6 +78,7 @@ struct psensor {
 
 	/* lm-sensor */
 	const sensors_chip_name *iname;
+
 	const sensors_feature *feature;
 
 	/* Maximum length of 'values' */
@@ -84,7 +92,7 @@ struct psensor {
 	struct color *color;
 
 	/* Whether the graph sensor is displayed. */
-	bool enabled;
+	bool graph_enabled;
 
 	/* see psensor_type */
 	unsigned int type;
@@ -104,7 +112,7 @@ struct psensor {
 	/* Whether an alarm is raised for this sensor */
 	unsigned int alarm_raised;
 
-	void (*cb_alarm_raised) (struct psensor *, void *);
+	void (*cb_alarm_raised)(struct psensor *, void *);
 	void *cb_alarm_raised_data;
 
 #ifdef HAVE_NVIDIA
@@ -119,6 +127,9 @@ struct psensor {
 	SkDisk *disk;
 #endif
 
+	void *provider_data;
+	void (*provider_data_free_fct)(void *);
+
 	char *url;
 
 	bool appindicator_enabled;
@@ -137,6 +148,8 @@ 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);
 
@@ -146,7 +159,6 @@ struct psensor *psensor_list_get_by_id(struct psensor **sensors,
 int psensor_list_contains_type(struct psensor **sensors, unsigned int type);
 
 int is_temp_type(unsigned int type);
-int is_fan_type(unsigned int type);
 
 double get_min_temp(struct psensor **sensors);
 double get_max_temp(struct psensor **sensors);
@@ -168,22 +180,26 @@ psensor_get_max_current_value(struct psensor **sensors, unsigned int type);
 */
 char *psensor_value_to_str(unsigned int type,
 			   double value,
-			   int use_celcius);
+			   int use_celsius);
 
 char *psensor_measure_to_str(const struct measure *m,
 			     unsigned int type,
-			     unsigned int use_celcius);
+			     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);
 
+void psensor_list_append(struct psensor ***sensors, struct psensor *sensor);
+
+struct psensor **psensor_list_copy(struct psensor **);
+
 void psensor_set_current_value(struct psensor *sensor, double value);
 void psensor_set_current_measure(struct psensor *sensor, double value,
 				 struct timeval tv);
 
-double psensor_get_current_value(struct psensor *sensor);
+double psensor_get_current_value(const struct psensor *);
 
 struct measure *psensor_get_current_measure(struct psensor *sensor);
 
@@ -192,9 +208,7 @@ struct measure *psensor_get_current_measure(struct psensor *sensor);
 */
 const char *psensor_type_to_str(unsigned int type);
 
-const char *psensor_type_to_unit_str(unsigned int type, int use_celcius);
-
-void psensor_list_update_measures(struct psensor **sensors);
+const char *psensor_type_to_unit_str(unsigned int type, int use_celsius);
 
 void psensor_init();
 
@@ -202,9 +216,7 @@ void psensor_cleanup();
 
 double get_max_value(struct psensor **sensors, int type);
 
-double celcius_to_fahrenheit(double c);
-double fahrenheit_to_celcius(double c);
-
+char *psensor_current_value_to_str(const struct psensor *, unsigned int);
 
 void psensor_log_measures(struct psensor **sensors);