wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-11-06 15:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added support for humidity sensors to libsensors

Browse Source 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5918 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Guenter Roeck committed 2011-02-13 18:55:09 +00:00
1 parent fb325cf089
commit c618c56023
3 files changed
+19 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

doc/libsensors-API.txt
+3
View File
@@ -33,6 +33,9 @@ given new feature.
enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_CRIT
enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_LCRIT_ALARM
enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_CRIT_ALARM
* Added support for humidity sensors
enum sensors_feature_type SENSORS_FEATURE_HUMIDITY
enum sensors_subfeature_type SENSORS_SUBFEATURE_HUMIDITY_INPUT
0x430 lm-sensors 3.2.0
* License changed from GPL to LGPL
lib/sensors.h
+3
View File
@@ -140,6 +140,7 @@ typedef enum sensors_feature_type {
SENSORS_FEATURE_POWER = 0x03,
SENSORS_FEATURE_ENERGY = 0x04,
SENSORS_FEATURE_CURR = 0x05,
SENSORS_FEATURE_HUMIDITY = 0x06,
SENSORS_FEATURE_MAX_MAIN,
SENSORS_FEATURE_VID = 0x10,
SENSORS_FEATURE_INTRUSION = 0x11,
@@ -220,6 +221,8 @@ typedef enum sensors_subfeature_type {
SENSORS_SUBFEATURE_CURR_LCRIT_ALARM,
SENSORS_SUBFEATURE_CURR_CRIT_ALARM,
SENSORS_SUBFEATURE_HUMIDITY_INPUT = SENSORS_FEATURE_HUMIDITY << 8,
SENSORS_SUBFEATURE_VID = SENSORS_FEATURE_VID << 8,
SENSORS_SUBFEATURE_INTRUSION_ALARM = SENSORS_FEATURE_INTRUSION << 8,
lib/sysfs.c
+13 -2
View File
@@ -143,8 +143,10 @@ char sensors_sysfs_mount[NAME_MAX];
#define FEATURE_SIZE (max_subfeatures * 2)
#define FEATURE_TYPE_SIZE (MAX_SENSORS_PER_TYPE * FEATURE_SIZE)
/* Room for all 6 main types (in, fan, temp, power, energy, current) and 2
other types (VID, intrusion) with all their subfeatures + misc features */
/*
* Room for all 7 main types (in, fan, temp, power, energy, current, humidity)
* and 2 other types (VID, intrusion) with all their subfeatures + misc features
*/
#define SUB_OFFSET_OTHER (MAX_MAIN_SENSOR_TYPES * FEATURE_TYPE_SIZE)
#define SUB_OFFSET_MISC (SUB_OFFSET_OTHER + \
MAX_OTHER_SENSOR_TYPES * FEATURE_TYPE_SIZE)
@@ -158,6 +160,7 @@ int get_type_scaling(sensors_subfeature_type type)
case SENSORS_SUBFEATURE_IN_INPUT:
case SENSORS_SUBFEATURE_TEMP_INPUT:
case SENSORS_SUBFEATURE_CURR_INPUT:
case SENSORS_SUBFEATURE_HUMIDITY_INPUT:
return 1000;
case SENSORS_SUBFEATURE_FAN_INPUT:
return 1;
@@ -190,6 +193,7 @@ char *get_feature_name(sensors_feature_type ftype, char *sfname)
case SENSORS_FEATURE_POWER:
case SENSORS_FEATURE_ENERGY:
case SENSORS_FEATURE_CURR:
case SENSORS_FEATURE_HUMIDITY:
case SENSORS_FEATURE_INTRUSION:
underscore = strchr(sfname, '_');
name = strndup(sfname, underscore - sfname);
@@ -306,6 +310,11 @@ static const struct subfeature_type_match curr_matches[] = {
{ NULL, 0 }
};
static const struct subfeature_type_match humidity_matches[] = {
{ "input", SENSORS_SUBFEATURE_HUMIDITY_INPUT },
{ NULL, 0 }
};
static const struct subfeature_type_match cpu_matches[] = {
{ "vid", SENSORS_SUBFEATURE_VID },
{ NULL, 0 }
@@ -325,6 +334,7 @@ static struct feature_type_match matches[] = {
{ "curr%d%c", curr_matches },
{ "energy%d%c", energy_matches },
{ "intrusion%d%c", intrusion_matches },
{ "humidity%d%c", humidity_matches },
};
/* Return the subfeature type and channel number based on the subfeature
@@ -451,6 +461,7 @@ static int sensors_read_dynamic_chip(sensors_chip_features *chip,
case SENSORS_FEATURE_POWER:
case SENSORS_FEATURE_ENERGY:
case SENSORS_FEATURE_CURR:
case SENSORS_FEATURE_HUMIDITY:
nr--;
break;
default: