X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=blobdiff_plain;f=src%2Flib%2Fpsensor.c;h=348885af3c841b5722698a2fa067601a888382a5;hp=5be048ee2f6bb5cd6a125946597331439d1adb52;hb=f59206913efca168851e1a3f57b1b0f5a50495ec;hpb=dcd813f21c83592155f712ff1acf450b483d8072

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index 5be048e..348885a 100644
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2013 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
@@ -209,18 +209,18 @@ int is_fan_type(unsigned int type)
 	return type & SENSOR_TYPE_FAN;
 }
 
-double celcius_to_fahrenheit(double c)
+double celsius_to_fahrenheit(double c)
 {
 	return c * (9.0/5.0) + 32;
 }
 
-double fahrenheit_to_celcius(double f)
+double fahrenheit_to_celsius(double f)
 {
 	return (f - 32) * (5.0/9.0);
 }
 
 char *
-psensor_value_to_str(unsigned int type, double value, int use_celcius)
+psensor_value_to_str(unsigned int type, double value, int use_celsius)
 {
 	char *str;
 	const char *unit;
@@ -231,10 +231,10 @@ psensor_value_to_str(unsigned int type, double value, int use_celcius)
 	 */
 	str = malloc(20);
 
-	unit = psensor_type_to_unit_str(type, use_celcius);
+	unit = psensor_type_to_unit_str(type, use_celsius);
 
-	if (is_temp_type(type) && !use_celcius)
-		value = celcius_to_fahrenheit(value);
+	if (is_temp_type(type) && !use_celsius)
+		value = celsius_to_fahrenheit(value);
 
 	sprintf(str, "%.0f%s", value, unit);
 
@@ -244,9 +244,9 @@ 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)
+		       unsigned int use_celsius)
 {
-	return psensor_value_to_str(type, m->value, use_celcius);
+	return psensor_value_to_str(type, m->value, use_celsius);
 }
 
 void psensor_set_current_value(struct psensor *sensor, double value)
@@ -437,8 +437,12 @@ 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_NVCTRL)
-		return "NVidia GPU";
+	if (type & SENSOR_TYPE_NVCTRL) {
+		if (type & SENSOR_TYPE_TEMP)
+			return "NVIDIA GPU Temperature";
+		else
+			return "NVIDIA GPU";
+	}
 
 	if (type & SENSOR_TYPE_ATIADL) {
 		if (type & SENSOR_TYPE_TEMP)
@@ -471,10 +475,10 @@ const char *psensor_type_to_str(unsigned int type)
 }
 
 
-const char *psensor_type_to_unit_str(unsigned int type, int use_celcius)
+const char *psensor_type_to_unit_str(unsigned int type, int use_celsius)
 {
 	if (is_temp_type(type)) {
-		if (use_celcius)
+		if (use_celsius)
 			return "\302\260C";
 		else
 			return "\302\260F";
@@ -541,11 +545,11 @@ struct psensor **psensor_list_copy(struct psensor **sensors)
 }
 
 char *
-psensor_current_value_to_str(const struct psensor *s, unsigned int celcius)
+psensor_current_value_to_str(const struct psensor *s, unsigned int use_celsius)
 {
 	return psensor_value_to_str(s->type,
 				    psensor_get_current_value(s),
-				    celcius);
+				    use_celsius);
 }
 
 struct psensor **psensor_list_filter_graph_enabled(struct psensor **sensors)