Changeset 6007

Show
Ignore:
Timestamp:
01/09/12 18:30:10 (2 years ago)
Author:
groeck
Message:

Add support for additional sysfs attributes to libsensors and to sensors command

inX_average
inX_lowest
inX_highest
tempX_lowest
tempX_highest
currX_average
currX_lowest
currX_highest

Location:
lm-sensors/trunk
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • lm-sensors/trunk/CHANGES

    r6001 r6007  
    33 
    44SVN HEAD 
     5  libsensors: Added support for new sysfs attributes 
     6  sensors: Added support for new sysfs attributes 
    57  fancontrol: Support setup where one PWM output controls several fans 
    68              Output error messages to stderr 
  • lm-sensors/trunk/doc/libsensors-API.txt

    r5986 r6007  
    77given new feature. 
    88 
     9SVN HEAD 
     10* Added support for new sysfs attributes 
     11  enum sensors_subfeature_type SENSORS_SUBFEATURE_IN_AVERAGE 
     12  enum sensors_subfeature_type SENSORS_SUBFEATURE_IN_LOWEST 
     13  enum sensors_subfeature_type SENSORS_SUBFEATURE_IN_HIGHEST 
     14  enum sensors_subfeature_type SENSORS_SUBFEATURE_TEMP_LOWEST 
     15  enum sensors_subfeature_type SENSORS_SUBFEATURE_TEMP_HIGHEST 
     16  enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_AVERAGE 
     17  enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_LOWEST 
     18  enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_HIGHEST 
    9190x431   lm-sensors 3.3.0 to 3.3.1 
    1020* Added support for intrusion detection 
  • lm-sensors/trunk/lib/sensors.h

    r5949 r6007  
    158158        SENSORS_SUBFEATURE_IN_LCRIT, 
    159159        SENSORS_SUBFEATURE_IN_CRIT, 
     160        SENSORS_SUBFEATURE_IN_AVERAGE, 
     161        SENSORS_SUBFEATURE_IN_LOWEST, 
     162        SENSORS_SUBFEATURE_IN_HIGHEST, 
    160163        SENSORS_SUBFEATURE_IN_ALARM = (SENSORS_FEATURE_IN << 8) | 0x80, 
    161164        SENSORS_SUBFEATURE_IN_MIN_ALARM, 
     
    182185        SENSORS_SUBFEATURE_TEMP_EMERGENCY, 
    183186        SENSORS_SUBFEATURE_TEMP_EMERGENCY_HYST, 
     187        SENSORS_SUBFEATURE_TEMP_LOWEST, 
     188        SENSORS_SUBFEATURE_TEMP_HIGHEST, 
    184189        SENSORS_SUBFEATURE_TEMP_ALARM = (SENSORS_FEATURE_TEMP << 8) | 0x80, 
    185190        SENSORS_SUBFEATURE_TEMP_MAX_ALARM, 
     
    216221        SENSORS_SUBFEATURE_CURR_LCRIT, 
    217222        SENSORS_SUBFEATURE_CURR_CRIT, 
     223        SENSORS_SUBFEATURE_CURR_AVERAGE, 
     224        SENSORS_SUBFEATURE_CURR_LOWEST, 
     225        SENSORS_SUBFEATURE_CURR_HIGHEST, 
    218226        SENSORS_SUBFEATURE_CURR_ALARM = (SENSORS_FEATURE_CURR << 8) | 0x80, 
    219227        SENSORS_SUBFEATURE_CURR_MIN_ALARM, 
  • lm-sensors/trunk/lib/sysfs.c

    r5938 r6007  
    234234        { "emergency", SENSORS_SUBFEATURE_TEMP_EMERGENCY }, 
    235235        { "emergency_hyst", SENSORS_SUBFEATURE_TEMP_EMERGENCY_HYST }, 
     236        { "lowest", SENSORS_SUBFEATURE_TEMP_LOWEST }, 
     237        { "highest", SENSORS_SUBFEATURE_TEMP_HIGHEST }, 
    236238        { "alarm", SENSORS_SUBFEATURE_TEMP_ALARM }, 
    237239        { "min_alarm", SENSORS_SUBFEATURE_TEMP_MIN_ALARM }, 
     
    253255        { "lcrit", SENSORS_SUBFEATURE_IN_LCRIT }, 
    254256        { "crit", SENSORS_SUBFEATURE_IN_CRIT }, 
     257        { "average", SENSORS_SUBFEATURE_IN_AVERAGE }, 
     258        { "lowest", SENSORS_SUBFEATURE_IN_LOWEST }, 
     259        { "highest", SENSORS_SUBFEATURE_IN_HIGHEST }, 
    255260        { "alarm", SENSORS_SUBFEATURE_IN_ALARM }, 
    256261        { "min_alarm", SENSORS_SUBFEATURE_IN_MIN_ALARM }, 
     
    303308        { "lcrit", SENSORS_SUBFEATURE_CURR_LCRIT }, 
    304309        { "crit", SENSORS_SUBFEATURE_CURR_CRIT }, 
     310        { "average", SENSORS_SUBFEATURE_CURR_AVERAGE }, 
     311        { "lowest", SENSORS_SUBFEATURE_CURR_LOWEST }, 
     312        { "highest", SENSORS_SUBFEATURE_CURR_HIGHEST }, 
    305313        { "alarm", SENSORS_SUBFEATURE_CURR_ALARM }, 
    306314        { "min_alarm", SENSORS_SUBFEATURE_CURR_MIN_ALARM }, 
  • lm-sensors/trunk/prog/sensors/chips.c

    r6006 r6007  
    267267        { SENSORS_SUBFEATURE_TEMP_EMERGENCY, temp_emergency_sensors, 0, 
    268268            "emerg" }, 
     269        { SENSORS_SUBFEATURE_TEMP_LOWEST, NULL, 0, "lowest" }, 
     270        { SENSORS_SUBFEATURE_TEMP_HIGHEST, NULL, 0, "highest" }, 
    269271        { -1, NULL, 0, NULL } 
    270272}; 
     
    358360        { SENSORS_SUBFEATURE_IN_MAX, NULL, 0, "max" }, 
    359361        { SENSORS_SUBFEATURE_IN_CRIT, NULL, 0, "crit max" }, 
     362        { SENSORS_SUBFEATURE_IN_AVERAGE, NULL, 0, "avg" }, 
     363        { SENSORS_SUBFEATURE_IN_LOWEST, NULL, 0, "lowest" }, 
     364        { SENSORS_SUBFEATURE_IN_HIGHEST, NULL, 0, "highest" }, 
    360365        { -1, NULL, 0, NULL } 
    361366}; 
     
    652657        { SENSORS_SUBFEATURE_CURR_MAX, NULL, 0, "max" }, 
    653658        { SENSORS_SUBFEATURE_CURR_CRIT, NULL, 0, "crit max" }, 
     659        { SENSORS_SUBFEATURE_CURR_AVERAGE, NULL, 0, "avg" }, 
     660        { SENSORS_SUBFEATURE_CURR_LOWEST, NULL, 0, "lowest" }, 
     661        { SENSORS_SUBFEATURE_CURR_HIGHEST, NULL, 0, "highest" }, 
    654662        { -1, NULL, 0, NULL } 
    655663};