projects
/
psensor-pkg-ubuntu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.1.1
[psensor-pkg-ubuntu.git]
/
src
/
lib
/
psensor.c
diff --git
a/src/lib/psensor.c
b/src/lib/psensor.c
index
348885a
..
9f063d0
100644
(file)
--- a/
src/lib/psensor.c
+++ b/
src/lib/psensor.c
@@
-23,9
+23,10
@@
#include <libintl.h>
#define _(str) gettext(str)
#include <libintl.h>
#define _(str) gettext(str)
-#include "hdd.h"
-#include "psensor.h"
-#include "lmsensor.h"
+#include <hdd.h>
+#include <psensor.h>
+#include <lmsensor.h>
+#include <temperature.h>
#ifdef HAVE_GTOP
#include "cpu.h"
#ifdef HAVE_GTOP
#include "cpu.h"
@@
-209,16
+210,6
@@
int is_fan_type(unsigned int type)
return type & SENSOR_TYPE_FAN;
}
return type & SENSOR_TYPE_FAN;
}
-double celsius_to_fahrenheit(double c)
-{
- return c * (9.0/5.0) + 32;
-}
-
-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_celsius)
{
char *
psensor_value_to_str(unsigned int type, double value, int use_celsius)
{