projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed fct
[psensor.git]
/
src
/
lib
/
psensor.c
diff --git
a/src/lib/psensor.c
b/src/lib/psensor.c
index
ac6a5a5
..
b01c81b
100644
(file)
--- a/
src/lib/psensor.c
+++ b/
src/lib/psensor.c
@@
-89,6
+89,8
@@
void psensor_values_resize(struct psensor *s, int new_size)
void psensor_free(struct psensor *sensor)
{
if (sensor) {
void psensor_free(struct psensor *sensor)
{
if (sensor) {
+ log_debug("Cleanup %s", sensor->id);
+
free(sensor->name);
free(sensor->id);
free(sensor->name);
free(sensor->id);
@@
-203,9
+205,13
@@
double celcius_to_fahrenheit(double c)
return c * (9.0/5.0) + 32;
}
return c * (9.0/5.0) + 32;
}
-char *psensor_value_to_string(unsigned int type,
- double value,
- int use_celcius)
+double fahrenheit_to_celcius(double f)
+{
+ return (f - 32) * (5.0/9.0);
+}
+
+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 */
{
/* should not be possible to exceed 20 characters with temp or
rpm values the .x part is never displayed */
@@
-215,9
+221,9
@@
char *psensor_value_to_string(unsigned int type,
if (is_temp_type(type))
if (use_celcius) {
if (is_temp_type(type))
if (use_celcius) {
- unit = "C";
+ unit = "
°
C";
} else {
} else {
- unit = "F";
+ unit = "
°
F";
value = celcius_to_fahrenheit(value);
}
else if (type & SENSOR_TYPE_CPU_USAGE)
value = celcius_to_fahrenheit(value);
}
else if (type & SENSOR_TYPE_CPU_USAGE)
@@
-248,7
+254,7
@@
psensor_set_current_measure(struct psensor *s,
&s->measures[1],
(s->values_max_length - 1) * sizeof(struct measure));
&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)
s->measures[s->values_max_length - 1].time = tv;
if (s->min == UNKNOWN_DBL_VALUE || v < s->min)
@@
-272,7
+278,7
@@
psensor_set_current_measure(struct psensor *s,
double psensor_get_current_value(struct psensor *sensor)
{
double psensor_get_current_value(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)
}
struct measure *psensor_get_current_measure(struct psensor *sensor)
@@
-297,7
+303,7
@@
double get_min_value(struct psensor **sensors, int type)
double t;
for (i = 0; i < sensor->values_max_length; 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;
if (t == UNKNOWN_DBL_VALUE)
continue;
@@
-328,7
+334,7
@@
double get_max_value(struct psensor **sensors, int type)
int i;
double t;
for (i = 0; i < sensor->values_max_length; i++) {
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;
if (t == UNKNOWN_DBL_VALUE)
continue;
@@
-453,9
+459,9
@@
const char *psensor_type_to_unit_str(unsigned int type, int use_celcius)
{
if (type & SENSOR_TYPE_TEMP) {
if (use_celcius)
{
if (type & SENSOR_TYPE_TEMP) {
if (use_celcius)
- return _("C");
+ return _("
°
C");
else
else
- return _("F");
+ return _("
°
F");
}
if (type & SENSOR_TYPE_FAN)
}
if (type & SENSOR_TYPE_FAN)