X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.c;h=bf7765bcfa31757b891cde5fa01d04326e476173;hb=dcf1b53921f5f9fdab59295be938c766bb572793;hp=89ed97e0111577319c16c96e5554cf74eb34ea22;hpb=ab5b213fd74bfba9e3d3f399741c5eeb52f3c8f6;p=psensor.git

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index 89ed97e..bf7765b 100644
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2013 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
@@ -31,15 +31,18 @@
 #include "cpu.h"
 #endif
 
-
-struct psensor *psensor_create(char *id, char *name,
-			       unsigned int type, int values_max_length)
+struct psensor *psensor_create(char *id,
+			       char *name,
+			       char *chip,
+			       unsigned int type,
+			       int values_max_length)
 {
 	struct psensor *psensor
 	    = (struct psensor *)malloc(sizeof(struct psensor));
 
 	psensor->id = id;
 	psensor->name = name;
+	psensor->chip = chip;
 	psensor->enabled = 1;
 	psensor->min = UNKNOWN_DBL_VALUE;
 	psensor->max = UNKNOWN_DBL_VALUE;
@@ -49,18 +52,20 @@ struct psensor *psensor_create(char *id, char *name,
 	psensor->values_max_length = values_max_length;
 	psensor->measures = measures_dbl_create(values_max_length);
 
-	psensor->alarm_limit = 0;
+	psensor->alarm_enabled = 0;
+	psensor->alarm_high_threshold = 0;
+	psensor->alarm_low_threshold = 0;
 
 	psensor->cb_alarm_raised = NULL;
 	psensor->cb_alarm_raised_data = NULL;
 	psensor->alarm_raised = 0;
 
-	psensor->alarm_enabled = 0;
-
 	psensor->url = NULL;
 
 	psensor->color = NULL;
 
+	psensor->appindicator_enabled = 0;
+
 	return psensor;
 }
 
@@ -94,6 +99,9 @@ void psensor_free(struct psensor *sensor)
 		free(sensor->name);
 		free(sensor->id);
 
+		if (sensor->chip)
+			free(sensor->chip);
+
 		if (sensor->color)
 			free(sensor->color);
 
@@ -151,7 +159,7 @@ int psensor_list_contains_type(struct psensor **sensors, unsigned int type)
 
 	s = sensors;
 	while (*s) {
-		if ((*s)->type == type)
+		if ((*s)->type & type)
 			return 1;
 		s++;
 	}
@@ -210,33 +218,36 @@ double fahrenheit_to_celcius(double f)
 	return (f - 32) * (5.0/9.0);
 }
 
-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)
 {
-	/* should not be possible to exceed 20 characters with temp or
-	   rpm values the .x part is never displayed */
-	char *str = malloc(20);
+	char *str;
+	const char *unit;
 
-	char *unit;
+	/*
+	 * should not be possible to exceed 20 characters with temp or
+	 * rpm values the .x part is never displayed
+	 */
+	str = malloc(20);
 
-	if (is_temp_type(type))
-		if (use_celcius) {
-			unit = "°C";
-		} else {
-			unit = "°F";
-			value = celcius_to_fahrenheit(value);
-		}
-	else if (type & SENSOR_TYPE_CPU_USAGE)
-		unit = "%";
-	else
-		unit = "";
+	unit = psensor_type_to_unit_str(type, use_celcius);
+
+	if (is_temp_type(type) && !use_celcius)
+		value = celcius_to_fahrenheit(value);
 
 	sprintf(str, "%.0f%s", value, unit);
 
 	return str;
 }
 
+char *
+psensor_measure_to_str(const struct measure *m,
+		       unsigned int type,
+		       unsigned int use_celcius)
+{
+	return psensor_value_to_str(type, m->value, use_celcius);
+}
+
 void psensor_set_current_value(struct psensor *sensor, double value)
 {
 	struct timeval tv;
@@ -255,7 +266,7 @@ psensor_set_current_measure(struct psensor *s,
 		&s->measures[1],
 		(s->values_max_length - 1) * sizeof(struct measure));
 
-	s->measures[s->values_max_length - 1].value.d_num = v;
+	s->measures[s->values_max_length - 1].value = v;
 	s->measures[s->values_max_length - 1].time = tv;
 
 	if (s->min == UNKNOWN_DBL_VALUE || v < s->min)
@@ -264,11 +275,10 @@ psensor_set_current_measure(struct psensor *s,
 	if (s->max == UNKNOWN_DBL_VALUE || v > s->max)
 		s->max = v;
 
-	if (s->alarm_limit && s->alarm_enabled) {
-		if (v > s->alarm_limit) {
+	if (s->alarm_enabled) {
+		if (v > s->alarm_high_threshold || v < s->alarm_low_threshold) {
 			if (!s->alarm_raised && s->cb_alarm_raised)
-				s->cb_alarm_raised(s,
-						   s->cb_alarm_raised_data);
+				s->cb_alarm_raised(s, s->cb_alarm_raised_data);
 
 			s->alarm_raised = 1;
 		} else {
@@ -277,9 +287,9 @@ psensor_set_current_measure(struct psensor *s,
 	}
 }
 
-double psensor_get_current_value(struct psensor *sensor)
+double psensor_get_current_value(const struct psensor *sensor)
 {
-	return sensor->measures[sensor->values_max_length - 1].value.d_num;
+	return sensor->measures[sensor->values_max_length - 1].value;
 }
 
 struct measure *psensor_get_current_measure(struct psensor *sensor)
@@ -304,7 +314,7 @@ double get_min_value(struct psensor **sensors, int type)
 			double t;
 
 			for (i = 0; i < sensor->values_max_length; i++) {
-				t = sensor->measures[i].value.d_num;
+				t = sensor->measures[i].value;
 
 				if (t == UNKNOWN_DBL_VALUE)
 					continue;
@@ -335,7 +345,7 @@ double get_max_value(struct psensor **sensors, int type)
 			int i;
 			double t;
 			for (i = 0; i < sensor->values_max_length; i++) {
-				t = sensor->measures[i].value.d_num;
+				t = sensor->measures[i].value;
 
 				if (t == UNKNOWN_DBL_VALUE)
 					continue;
@@ -394,7 +404,7 @@ double get_max_temp(struct psensor **sensors)
 
 struct psensor **get_all_sensors(int use_libatasmart, int values_max_length)
 {
-	struct psensor **psensors = NULL;
+	struct psensor **psensors;
 	struct psensor **tmp_psensors;
 
 	psensors = lmsensor_psensor_list_add(NULL, values_max_length);
@@ -428,19 +438,22 @@ struct psensor **get_all_sensors(int use_libatasmart, int values_max_length)
 
 const char *psensor_type_to_str(unsigned int type)
 {
-	if ((type & SENSOR_TYPE_NVIDIA_TEMP) == SENSOR_TYPE_NVIDIA_TEMP)
-		return "NVidia GPU Temperature";
-
-	if ((type & SENSOR_TYPE_AMD_TEMP) == SENSOR_TYPE_AMD_TEMP)
-		return "AMD GPU Temperature";
-
-	if ((type & SENSOR_TYPE_AMD_FAN) == SENSOR_TYPE_AMD_FAN)
-		return "AMD GPU Fan Speed";
+	if (type & SENSOR_TYPE_NVCTRL)
+		return "NVidia GPU";
+
+	if (type & SENSOR_TYPE_ATIADL) {
+		if (type & SENSOR_TYPE_TEMP)
+			return "AMD GPU Temperature";
+		else if (type & SENSOR_TYPE_RPM)
+			return "AMD GPU Fan Speed";
+		else /* type & SENSOR_TYPE_USAGE */
+			return "AMD GPU Usage";
+	}
 
 	if ((type & SENSOR_TYPE_HDD_TEMP) == SENSOR_TYPE_HDD_TEMP)
 		return "HDD Temperature";
 
-	if (type & SENSOR_TYPE_CPU_USAGE)
+	if ((type & SENSOR_TYPE_CPU_USAGE) == SENSOR_TYPE_CPU_USAGE)
 		return "CPU Usage";
 
 	if (type & SENSOR_TYPE_TEMP)
@@ -449,29 +462,30 @@ const char *psensor_type_to_str(unsigned int type)
 	if (type & SENSOR_TYPE_FAN)
 		return "Fan";
 
+	if (type & SENSOR_TYPE_CPU)
+		return "CPU";
+
 	if (type & SENSOR_TYPE_REMOTE)
 		return "Remote";
 
-	return "N/A";		/* should not be possible */
+	return "N/A";
 }
 
 
 const char *psensor_type_to_unit_str(unsigned int type, int use_celcius)
 {
-	if (type & SENSOR_TYPE_TEMP) {
+	if (is_temp_type(type)) {
 		if (use_celcius)
-			return _("°C");
+			return "\302\260C";
 		else
-			return _("°F");
-	}
-
-	if (type & SENSOR_TYPE_FAN)
+			return "\302\260F";
+	} else if (is_fan_type(type)) {
 		return _("RPM");
-
-	if (type & SENSOR_TYPE_CPU_USAGE)
+	} else if (type & SENSOR_TYPE_CPU_USAGE) {
 		return _("%");
-
-	return "N/A";
+	} else {
+		return _("N/A");
+	}
 }
 
 void psensor_list_update_measures(struct psensor **sensors)
@@ -482,12 +496,11 @@ void psensor_list_update_measures(struct psensor **sensors)
 	cpu_psensor_list_update(sensors);
 #endif
 
-	if (psensor_list_contains_type(sensors, SENSOR_TYPE_HDD_TEMP_HDDTEMP))
+	if (psensor_list_contains_type(sensors, SENSOR_TYPE_HDDTEMP))
 		hddtemp_psensor_list_update(sensors);
 
 #ifdef HAVE_ATASMART
-	if (psensor_list_contains_type(sensors,
-				       SENSOR_TYPE_HDD_TEMP_ATASMART))
+	if (psensor_list_contains_type(sensors, SENSOR_TYPE_ATASMART))
 		hdd_psensor_list_update(sensors);
 #endif
 }
@@ -513,3 +526,25 @@ void psensor_cleanup()
 {
 	lmsensor_cleanup();
 }
+
+struct psensor **psensor_list_copy(struct psensor **sensors)
+{
+	struct psensor **result;
+	int n, i;
+
+	n = psensor_list_size(sensors);
+	result = malloc((n+1) * sizeof(struct psensor *));
+	for (i = 0; i < n; i++)
+		result[i] = sensors[i];
+	result[n] = NULL;
+
+	return result;
+}
+
+char *
+psensor_current_value_to_str(const struct psensor *s, unsigned int celcius)
+{
+	return psensor_value_to_str(s->type,
+				    psensor_get_current_value(s),
+				    celcius);
+}