/*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2013 jeanfi@gmail.com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
#ifndef _PSENSOR_PSENSOR_H_
#define _PSENSOR_PSENSOR_H_
-#include "config.h"
#include <sensors/sensors.h>
+#include "config.h"
#ifdef HAVE_ATASMART
#include <atasmart.h>
#endif
+#include "bool.h"
#include "color.h"
#include "log.h"
#include "measure.h"
enum psensor_type {
- SENSOR_TYPE_TEMP = 0x0001,
- SENSOR_TYPE_FAN = 0x0002,
- SENSOR_TYPE_REMOTE = 0x0004,
-
- SENSOR_TYPE_LMSENSOR = 0x0100,
- SENSOR_TYPE_NVIDIA_TEMP = 0x0200 | SENSOR_TYPE_TEMP,
- SENSOR_TYPE_HDD_TEMP = 0x0400 | SENSOR_TYPE_TEMP,
- SENSOR_TYPE_CPU_USAGE = 0x0800,
- SENSOR_TYPE_AMD = 0x1000,
-
- SENSOR_TYPE_HDD_TEMP_ATASMART = 0x2000 | SENSOR_TYPE_HDD_TEMP,
- SENSOR_TYPE_HDD_TEMP_HDDTEMP = 0x4000 | SENSOR_TYPE_HDD_TEMP,
-
- SENSOR_TYPE_AMD_TEMP = SENSOR_TYPE_AMD | SENSOR_TYPE_TEMP,
- SENSOR_TYPE_AMD_FAN = SENSOR_TYPE_AMD | SENSOR_TYPE_FAN,
-
- SENSOR_TYPE_LMSENSOR_TEMP = SENSOR_TYPE_LMSENSOR | SENSOR_TYPE_TEMP,
- SENSOR_TYPE_LMSENSOR_FAN = SENSOR_TYPE_LMSENSOR | SENSOR_TYPE_FAN
+ /* type of sensor values */
+ SENSOR_TYPE_TEMP = 0x00001,
+ SENSOR_TYPE_RPM = 0x00002,
+ SENSOR_TYPE_USAGE = 0x00004,
+
+ /* Whether the sensor is remote */
+ SENSOR_TYPE_REMOTE = 0x00008,
+
+ /* Libraries used for retrieving sensor information */
+ SENSOR_TYPE_LMSENSOR = 0x00100,
+ SENSOR_TYPE_NVCTRL = 0x00200,
+ SENSOR_TYPE_GTOP = 0x00400,
+ SENSOR_TYPE_ATIADL = 0x00800,
+ SENSOR_TYPE_ATASMART = 0x01000,
+ SENSOR_TYPE_HDDTEMP = 0x02000,
+
+ /* Type of HW component */
+ SENSOR_TYPE_HDD = 0x04000,
+ SENSOR_TYPE_CPU = 0x08000,
+ SENSOR_TYPE_GPU = 0x10000,
+ SENSOR_TYPE_FAN = 0x20000,
+
+ /* Combinations */
+ SENSOR_TYPE_HDD_TEMP = (SENSOR_TYPE_HDD | SENSOR_TYPE_TEMP),
+ SENSOR_TYPE_CPU_USAGE = (SENSOR_TYPE_CPU | SENSOR_TYPE_USAGE)
};
struct psensor {
/* Uniq id of the sensor */
char *id;
+ /* Name of the chip. */
+ char *chip;
+
/* lm-sensor */
const sensors_chip_name *iname;
const sensors_feature *feature;
/* Color of the sensor used for the graph */
struct color *color;
- /* Whether the sensor is displayed in the graph */
- int enabled;
+ /* Whether the graph sensor is displayed. */
+ bool enabled;
/* see psensor_type */
unsigned int type;
double min;
/* Whether alarm alert is enabled for this sensor */
- unsigned int alarm_enabled;
+ bool alarm_enabled;
- int alarm_high_thresold;
- int alarm_low_thresold;
+ int alarm_high_threshold;
+ int alarm_low_threshold;
- /* Whether the current value is bigger than 'alarm_high_thresold'. */
- int alarm_raised;
+ /* Whether an alarm is raised for this sensor */
+ unsigned int alarm_raised;
void (*cb_alarm_raised) (struct psensor *, void *);
void *cb_alarm_raised_data;
#ifdef HAVE_ATASMART
SkDisk *disk;
#endif
-
char *url;
+
+ bool appindicator_enabled;
};
struct psensor *psensor_create(char *id,
- char *name, unsigned int type,
+ char *name,
+ char *chip,
+ unsigned int type,
int values_max_length);
void psensor_values_resize(struct psensor *s, int new_size);