X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.h;h=012bd128d8c03dc5d27877dabbc6adde36588355;hb=9cd75dc72c567208d839e73ee6e4ecf484a08b7c;hp=099556f0e80164ace3df05a49d9cf058a70205c9;hpb=7cf703ceb488aaefdbf43e496e44865ead748e54;p=psensor.git

diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index 099556f..012bd12 100644
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -1,29 +1,34 @@
 /*
-    Copyright (C) 2010-2011 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 published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301 USA
-*/
-
+ * Copyright (C) 2010-2012 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
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
 #ifndef _PSENSOR_PSENSOR_H_
 #define _PSENSOR_PSENSOR_H_
 
-#include "config.h"
 #include <sensors/sensors.h>
 
+#include "config.h"
+#ifdef HAVE_ATASMART
+#include <atasmart.h>
+#endif
+
+#include "bool.h"
 #include "color.h"
+#include "log.h"
 #include "measure.h"
 
 enum psensor_type {
@@ -37,6 +42,9 @@ enum psensor_type {
 	SENSOR_TYPE_CPU_USAGE = 0x0800,
 	SENSOR_TYPE_AMD = 0x1000,
 
+	SENSOR_TYPE_HDD_TEMP_ATASMART = 0x2000 | SENSOR_TYPE_HDD_TEMP,
+	SENSOR_TYPE_HDD_TEMP_HDDTEMP = 0x4000 | SENSOR_TYPE_HDD_TEMP,
+
 	SENSOR_TYPE_AMD_TEMP = SENSOR_TYPE_AMD | SENSOR_TYPE_TEMP,
 	SENSOR_TYPE_AMD_FAN = SENSOR_TYPE_AMD | SENSOR_TYPE_FAN,
 
@@ -65,8 +73,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. */
+	bool enabled;
 
 	/* see psensor_type */
 	unsigned int type;
@@ -77,19 +85,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 */
+	bool 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;
@@ -102,8 +105,13 @@ struct psensor {
 	/* AMD id for the aticonfig */
 	int amd_id;
 #endif
+#ifdef HAVE_ATASMART
+	SkDisk *disk;
+#endif
 
 	char *url;
+
+	bool appindicator_enabled;
 };
 
 struct psensor *psensor_create(char *id,
@@ -146,9 +154,15 @@ 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);
+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 values_max_length);
+struct psensor **get_all_sensors(int use_libatasmart, int values_max_length);
 
 struct psensor **psensor_list_add(struct psensor **sensors,
 				  struct psensor *sensor);
@@ -166,7 +180,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);
+const char *psensor_type_to_unit_str(unsigned int type, int use_celcius);
 
 void psensor_list_update_measures(struct psensor **sensors);
 
@@ -176,4 +190,10 @@ 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