projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed enabled => graph_enabled
[psensor.git]
/
src
/
lib
/
psensor.c
diff --git
a/src/lib/psensor.c
b/src/lib/psensor.c
index
2ae6011
..
995ad45
100644
(file)
--- a/
src/lib/psensor.c
+++ b/
src/lib/psensor.c
@@
-43,7
+43,6
@@
struct psensor *psensor_create(char *id,
psensor->id = id;
psensor->name = name;
psensor->chip = chip;
psensor->id = id;
psensor->name = name;
psensor->chip = chip;
- psensor->enabled = 1;
psensor->min = UNKNOWN_DBL_VALUE;
psensor->max = UNKNOWN_DBL_VALUE;
psensor->min = UNKNOWN_DBL_VALUE;
psensor->max = UNKNOWN_DBL_VALUE;
@@
-64,6
+63,7
@@
struct psensor *psensor_create(char *id,
psensor->color = NULL;
psensor->color = NULL;
+ psensor->graph_enabled = 1;
psensor->appindicator_enabled = 0;
return psensor;
psensor->appindicator_enabled = 0;
return psensor;
@@
-258,9
+258,7
@@
void psensor_set_current_value(struct psensor *sensor, double value)
psensor_set_current_measure(sensor, value, tv);
}
psensor_set_current_measure(sensor, value, tv);
}
-void
-psensor_set_current_measure(struct psensor *s,
- double v, struct timeval tv)
+void psensor_set_current_measure(struct psensor *s, double v, struct timeval tv)
{
memmove(s->measures,
&s->measures[1],
{
memmove(s->measures,
&s->measures[1],
@@
-287,7
+285,7
@@
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;
}
{
return sensor->measures[sensor->values_max_length - 1].value;
}
@@
-309,7
+307,7
@@
double get_min_value(struct psensor **sensors, int type)
while (*s) {
struct psensor *sensor = *s;
while (*s) {
struct psensor *sensor = *s;
- if (sensor->enabled && (sensor->type & type)) {
+ if (sensor->
graph_
enabled && (sensor->type & type)) {
int i;
double t;
int i;
double t;
@@
-341,7
+339,7
@@
double get_max_value(struct psensor **sensors, int type)
while (*s) {
struct psensor *sensor = *s;
while (*s) {
struct psensor *sensor = *s;
- if (sensor->enabled && (sensor->type & type)) {
+ if (sensor->
graph_
enabled && (sensor->type & 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++) {
@@
-369,7
+367,7
@@
psensor_get_max_current_value(struct psensor **sensors, unsigned int type)
while (*s_cur) {
struct psensor *s = *s_cur;
while (*s_cur) {
struct psensor *s = *s_cur;
- if (s->enabled && (s->type & type)) {
+ if (s->
graph_
enabled && (s->type & type)) {
double v = psensor_get_current_value(s);
if (m == UNKNOWN_DBL_VALUE || v > m)
double v = psensor_get_current_value(s);
if (m == UNKNOWN_DBL_VALUE || v > m)
@@
-541,3
+539,10
@@
struct psensor **psensor_list_copy(struct psensor **sensors)
return result;
}
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);
+}