Changeset 5918

Show
Ignore:
Timestamp:
02/13/11 19:55:09 (2 years ago)
Author:
groeck
Message:

Added support for humidity sensors to libsensors

Location:
lm-sensors/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • lm-sensors/trunk/doc/libsensors-API.txt

    r5917 r5918  
    3434  enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_LCRIT_ALARM 
    3535  enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_CRIT_ALARM 
     36* Added support for humidity sensors 
     37  enum sensors_feature_type SENSORS_FEATURE_HUMIDITY 
     38  enum sensors_subfeature_type SENSORS_SUBFEATURE_HUMIDITY_INPUT 
    3639 
    37400x430   lm-sensors 3.2.0 

  • lm-sensors/trunk/lib/sensors.h

    r5917 r5918  
    141141        SENSORS_FEATURE_ENERGY          = 0x04, 
    142142        SENSORS_FEATURE_CURR            = 0x05, 
     143        SENSORS_FEATURE_HUMIDITY        = 0x06, 
    143144        SENSORS_FEATURE_MAX_MAIN, 
    144145        SENSORS_FEATURE_VID             = 0x10, 
    … …  
    221222        SENSORS_SUBFEATURE_CURR_CRIT_ALARM, 
    222223 
     224        SENSORS_SUBFEATURE_HUMIDITY_INPUT = SENSORS_FEATURE_HUMIDITY << 8, 
     225 
    223226        SENSORS_SUBFEATURE_VID = SENSORS_FEATURE_VID << 8, 
    224227 

  • lm-sensors/trunk/lib/sysfs.c

    r5917 r5918  
    144144#define FEATURE_TYPE_SIZE       (MAX_SENSORS_PER_TYPE * FEATURE_SIZE) 
    145145 
    146 /* Room for all 6 main types (in, fan, temp, power, energy, current) and 2 
    147    other types (VID, intrusion) with all their subfeatures + misc features */ 
     146/* 
     147 * Room for all 7 main types (in, fan, temp, power, energy, current, humidity) 
     148 * and 2 other types (VID, intrusion) with all their subfeatures + misc features 
     149 */ 
    148150#define SUB_OFFSET_OTHER        (MAX_MAIN_SENSOR_TYPES * FEATURE_TYPE_SIZE) 
    149151#define SUB_OFFSET_MISC         (SUB_OFFSET_OTHER + \ 
    … …  
    159161        case SENSORS_SUBFEATURE_TEMP_INPUT: 
    160162        case SENSORS_SUBFEATURE_CURR_INPUT: 
     163        case SENSORS_SUBFEATURE_HUMIDITY_INPUT: 
    161164                return 1000; 
    162165        case SENSORS_SUBFEATURE_FAN_INPUT: 
    … …  
    191194        case SENSORS_FEATURE_ENERGY: 
    192195        case SENSORS_FEATURE_CURR: 
     196        case SENSORS_FEATURE_HUMIDITY: 
    193197        case SENSORS_FEATURE_INTRUSION: 
    194198                underscore = strchr(sfname, '_'); 
    … …  
    307311}; 
    308312 
     313static const struct subfeature_type_match humidity_matches[] = { 
     314        { "input", SENSORS_SUBFEATURE_HUMIDITY_INPUT }, 
     315        { NULL, 0 } 
     316}; 
     317 
    309318static const struct subfeature_type_match cpu_matches[] = { 
    310319        { "vid", SENSORS_SUBFEATURE_VID }, 
    … …  
    326335        { "energy%d%c", energy_matches }, 
    327336        { "intrusion%d%c", intrusion_matches }, 
     337        { "humidity%d%c", humidity_matches }, 
    328338}; 
    329339 
    … …  
    452462                case SENSORS_FEATURE_ENERGY: 
    453463                case SENSORS_FEATURE_CURR: 
     464                case SENSORS_FEATURE_HUMIDITY: 
    454465                        nr--; 
    455466                        break;