projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avoid configuration (color) field in psensor struct
[psensor.git]
/
src
/
lib
/
psensor.h
diff --git
a/src/lib/psensor.h
b/src/lib/psensor.h
index
d3ea669
..
56b349f
100644
(file)
--- a/
src/lib/psensor.h
+++ b/
src/lib/psensor.h
@@
-21,12
+21,7
@@
#include <config.h>
#include <config.h>
-#ifdef HAVE_ATASMART
-#include <atasmart.h>
-#endif
-
#include <bool.h>
#include <bool.h>
-#include <color.h>
#include <measure.h>
#include <plog.h>
#include <measure.h>
#include <plog.h>
@@
-82,12
+77,6
@@
struct psensor {
* oldest measure. */
struct measure *measures;
* oldest measure. */
struct measure *measures;
- /* Color of the sensor used for the graph */
- struct color *color;
-
- /* Whether the graph sensor is displayed. */
- bool graph_enabled;
-
/* see psensor_type */
unsigned int type;
/* see psensor_type */
unsigned int type;
@@
-97,14
+86,11
@@
struct psensor {
/* The minimum detected value of the sensor */
double min;
/* The minimum detected value of the sensor */
double min;
- /* Whether alarm alert is enabled for this sensor */
- bool alarm_enabled;
-
int alarm_high_threshold;
int alarm_low_threshold;
/* Whether an alarm is raised for this sensor */
int alarm_high_threshold;
int alarm_low_threshold;
/* Whether an alarm is raised for this sensor */
-
unsigned int
alarm_raised;
+
bool
alarm_raised;
void (*cb_alarm_raised)(struct psensor *, void *);
void *cb_alarm_raised_data;
void (*cb_alarm_raised)(struct psensor *, void *);
void *cb_alarm_raised_data;
@@
-113,16
+99,9
@@
struct psensor {
/* AMD id for the aticonfig */
int amd_id;
#endif
/* AMD id for the aticonfig */
int amd_id;
#endif
-#ifdef HAVE_ATASMART
- SkDisk *disk;
-#endif
void *provider_data;
void (*provider_data_free_fct)(void *);
void *provider_data;
void (*provider_data_free_fct)(void *);
-
- char *url;
-
- bool appindicator_enabled;
};
struct psensor *psensor_create(char *id,
};
struct psensor *psensor_create(char *id,
@@
-138,8
+117,6
@@
void psensor_free(struct psensor *sensor);
void psensor_list_free(struct psensor **sensors);
int psensor_list_size(struct psensor **sensors);
void psensor_list_free(struct psensor **sensors);
int psensor_list_size(struct psensor **sensors);
-struct psensor **psensor_list_filter_graph_enabled(struct psensor **);
-
struct psensor *psensor_list_get_by_id(struct psensor **sensors,
const char *id);
struct psensor *psensor_list_get_by_id(struct psensor **sensors,
const char *id);
@@
-151,10
+128,6
@@
double get_max_temp(struct psensor **sensors);
double get_min_rpm(struct psensor **sensors);
double get_max_rpm(struct psensor **sensors);
double get_min_rpm(struct psensor **sensors);
double get_max_rpm(struct psensor **sensors);
-/* Get the maximal current value of all sensors of a given type. */
-double
-psensor_get_max_current_value(struct psensor **sensors, unsigned int type);
-
/*
* Converts the value of a sensor to a string.
*
/*
* Converts the value of a sensor to a string.
*
@@
-169,8
+142,6
@@
char *psensor_measure_to_str(const struct measure *m,
unsigned int type,
unsigned int use_celsius);
unsigned int type,
unsigned int use_celsius);
-struct psensor **get_all_sensors(int use_libatasmart, int values_max_length);
-
struct psensor **psensor_list_add(struct psensor **sensors,
struct psensor *sensor);
struct psensor **psensor_list_add(struct psensor **sensors,
struct psensor *sensor);