X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.h;h=3b18a66a3404dc24e01694bd8ef3de71add8ba0b;hb=b0fbaa0cc4cdc38bc86e3739e5bc78d73ca063ec;hp=ad7364ec70c3f48b2d23e7a7931da00a3522f779;hpb=609664bb77874990e10f8073e54bb7f1645c8d72;p=psensor.git diff --git a/src/lib/psensor.h b/src/lib/psensor.h index ad7364e..3b18a66 100644 --- a/src/lib/psensor.h +++ b/src/lib/psensor.h @@ -1,29 +1,33 @@ /* - Copyright (C) 2010-2011 wpitchoune@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 published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - + * Copyright (C) 2010-2012 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 + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ #ifndef _PSENSOR_PSENSOR_H_ #define _PSENSOR_PSENSOR_H_ #include "config.h" #include +#ifdef HAVE_ATASMART +#include +#endif + #include "color.h" +#include "log.h" #include "measure.h" enum psensor_type { @@ -31,10 +35,20 @@ enum psensor_type { SENSOR_TYPE_FAN = 0x0002, SENSOR_TYPE_REMOTE = 0x0004, - SENSOR_TYPE_LMSENSOR_TEMP = 0x0100 | SENSOR_TYPE_TEMP, - SENSOR_TYPE_NVIDIA = 0x0200 | SENSOR_TYPE_TEMP, - SENSOR_TYPE_HDD_TEMP = 0x0300 | SENSOR_TYPE_TEMP, - SENSOR_TYPE_LMSENSOR_FAN = 0x0400 | SENSOR_TYPE_FAN + 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 }; struct psensor { @@ -58,8 +72,8 @@ struct psensor { /* 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. */ + unsigned int enabled; /* see psensor_type */ unsigned int type; @@ -70,19 +84,14 @@ struct psensor { /* The minimum detected value of the sensor */ double min; - /* - Whether alarm alerts is enabled for this sensor - */ - int alarm_enabled; + /* Whether alarm alert is enabled for this sensor */ + unsigned int alarm_enabled; - /* - An alarm is raised if the current sensor value is bigger. 0 - means no limit - */ - double alarm_limit; + int alarm_high_threshold; + int alarm_low_threshold; - /* Whether the current value is bigger than 'alarm_limit'. */ - 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; @@ -91,9 +100,17 @@ struct psensor { /* Nvidia id for the nvctrl */ int nvidia_id; #endif +#ifdef HAVE_LIBATIADL + /* AMD id for the aticonfig */ + int amd_id; +#endif +#ifdef HAVE_ATASMART + SkDisk *disk; +#endif char *url; + unsigned int appindicator_enabled; }; struct psensor *psensor_create(char *id, @@ -125,14 +142,26 @@ 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. parameter 'type' is SENSOR_TYPE_LMSENSOR_TEMP, SENSOR_TYPE_NVIDIA, or SENSOR_TYPE_LMSENSOR_FAN */ -char *psensor_value_to_string(unsigned int type, double value); +char *psensor_value_to_str(unsigned int type, + double value, + int use_celcius); + +char *psensor_measure_to_str(const struct measure *m, + unsigned int type, + unsigned int use_celcius); -struct psensor **get_all_sensors(int values_max_length); +struct psensor **get_all_sensors(int use_libatasmart, int values_max_length); struct psensor **psensor_list_add(struct psensor **sensors, struct psensor *sensor); @@ -150,6 +179,20 @@ struct measure *psensor_get_current_measure(struct psensor *sensor); */ const char *psensor_type_to_str(unsigned int type); +const char *psensor_type_to_unit_str(unsigned int type, int use_celcius); + void psensor_list_update_measures(struct psensor **sensors); +void psensor_init(); + +void psensor_cleanup(); + +double get_max_value(struct psensor **sensors, int type); + +double celcius_to_fahrenheit(double c); +double fahrenheit_to_celcius(double c); + + +void psensor_log_measures(struct psensor **sensors); + #endif