projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avoid to use a specific provider field
[psensor.git]
/
src
/
lib
/
psensor.h
diff --git
a/src/lib/psensor.h
b/src/lib/psensor.h
index
37891c3
..
f80f210
100644
(file)
--- a/
src/lib/psensor.h
+++ b/
src/lib/psensor.h
@@
-19,17
+19,12
@@
#ifndef _PSENSOR_PSENSOR_H_
#define _PSENSOR_PSENSOR_H_
#ifndef _PSENSOR_PSENSOR_H_
#define _PSENSOR_PSENSOR_H_
-#include <
sensors/sensors
.h>
+#include <
config
.h>
-#include "config.h"
-#ifdef HAVE_ATASMART
-#include <atasmart.h>
-#endif
-
-#include "bool.h"
-#include "color.h"
+#include <bool.h>
+#include <color.h>
+#include <measure.h>
#include <plog.h>
#include <plog.h>
-#include "measure.h"
enum psensor_type {
/* type of sensor values */
enum psensor_type {
/* type of sensor values */
@@
-76,11
+71,6
@@
struct psensor {
/* Name of the chip. */
char *chip;
/* Name of the chip. */
char *chip;
- /* lm-sensor */
- const sensors_chip_name *iname;
-
- const sensors_feature *feature;
-
/* Maximum length of 'values' */
int values_max_length;
/* Maximum length of 'values' */
int values_max_length;
@@
-91,9
+81,6
@@
struct psensor {
/* Color of the sensor used for the graph */
struct color *color;
/* 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;
@@
-103,14
+90,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;
@@
-119,16
+103,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,
@@
-144,8
+121,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);
@@
-157,10
+132,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.
*