Changeset 6007

Timestamp:

01/09/12 18:30:10 (17 months 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:

• CHANGES (modified) (1 diff)
• doc/libsensors-API.txt (modified) (1 diff)
• lib/sensors.h (modified) (3 diffs)
• lib/sysfs.c (modified) (3 diffs)
• prog/sensors/chips.c (modified) (3 diffs)

lm-sensors/trunk/CHANGES

@@ -3 +3 @@
 
 SVN HEAD
+  libsensors: Added support for new sysfs attributes
+  sensors: Added support for new sysfs attributes
   fancontrol: Support setup where one PWM output controls several fans
               Output error messages to stderr

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

@@ -7 +7 @@
 given new feature.
 
+SVN HEAD
+* Added support for new sysfs attributes
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_IN_AVERAGE
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_IN_LOWEST
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_IN_HIGHEST
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_TEMP_LOWEST
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_TEMP_HIGHEST
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_AVERAGE
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_LOWEST
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_CURR_HIGHEST
 0x431   lm-sensors 3.3.0 to 3.3.1
 * Added support for intrusion detection

lm-sensors/trunk/lib/sensors.h

@@ -158 +158 @@
         SENSORS_SUBFEATURE_IN_LCRIT,
         SENSORS_SUBFEATURE_IN_CRIT,
+        SENSORS_SUBFEATURE_IN_AVERAGE,
+        SENSORS_SUBFEATURE_IN_LOWEST,
+        SENSORS_SUBFEATURE_IN_HIGHEST,
         SENSORS_SUBFEATURE_IN_ALARM = (SENSORS_FEATURE_IN << 8) | 0x80,
         SENSORS_SUBFEATURE_IN_MIN_ALARM,
@@ -182 +185 @@
         SENSORS_SUBFEATURE_TEMP_EMERGENCY,
         SENSORS_SUBFEATURE_TEMP_EMERGENCY_HYST,
+        SENSORS_SUBFEATURE_TEMP_LOWEST,
+        SENSORS_SUBFEATURE_TEMP_HIGHEST,
         SENSORS_SUBFEATURE_TEMP_ALARM = (SENSORS_FEATURE_TEMP << 8) | 0x80,
         SENSORS_SUBFEATURE_TEMP_MAX_ALARM,
@@ -216 +221 @@
         SENSORS_SUBFEATURE_CURR_LCRIT,
         SENSORS_SUBFEATURE_CURR_CRIT,
+        SENSORS_SUBFEATURE_CURR_AVERAGE,
+        SENSORS_SUBFEATURE_CURR_LOWEST,
+        SENSORS_SUBFEATURE_CURR_HIGHEST,
         SENSORS_SUBFEATURE_CURR_ALARM = (SENSORS_FEATURE_CURR << 8) | 0x80,
         SENSORS_SUBFEATURE_CURR_MIN_ALARM,

lm-sensors/trunk/lib/sysfs.c

@@ -234 +234 @@
         { "emergency", SENSORS_SUBFEATURE_TEMP_EMERGENCY },
         { "emergency_hyst", SENSORS_SUBFEATURE_TEMP_EMERGENCY_HYST },
+        { "lowest", SENSORS_SUBFEATURE_TEMP_LOWEST },
+        { "highest", SENSORS_SUBFEATURE_TEMP_HIGHEST },
         { "alarm", SENSORS_SUBFEATURE_TEMP_ALARM },
         { "min_alarm", SENSORS_SUBFEATURE_TEMP_MIN_ALARM },
@@ -253 +255 @@
         { "lcrit", SENSORS_SUBFEATURE_IN_LCRIT },
         { "crit", SENSORS_SUBFEATURE_IN_CRIT },
+        { "average", SENSORS_SUBFEATURE_IN_AVERAGE },
+        { "lowest", SENSORS_SUBFEATURE_IN_LOWEST },
+        { "highest", SENSORS_SUBFEATURE_IN_HIGHEST },
         { "alarm", SENSORS_SUBFEATURE_IN_ALARM },
         { "min_alarm", SENSORS_SUBFEATURE_IN_MIN_ALARM },
@@ -303 +308 @@
         { "lcrit", SENSORS_SUBFEATURE_CURR_LCRIT },
         { "crit", SENSORS_SUBFEATURE_CURR_CRIT },
+        { "average", SENSORS_SUBFEATURE_CURR_AVERAGE },
+        { "lowest", SENSORS_SUBFEATURE_CURR_LOWEST },
+        { "highest", SENSORS_SUBFEATURE_CURR_HIGHEST },
         { "alarm", SENSORS_SUBFEATURE_CURR_ALARM },
         { "min_alarm", SENSORS_SUBFEATURE_CURR_MIN_ALARM },

lm-sensors/trunk/prog/sensors/chips.c

@@ -267 +267 @@
         { SENSORS_SUBFEATURE_TEMP_EMERGENCY, temp_emergency_sensors, 0,
             "emerg" },
+        { SENSORS_SUBFEATURE_TEMP_LOWEST, NULL, 0, "lowest" },
+        { SENSORS_SUBFEATURE_TEMP_HIGHEST, NULL, 0, "highest" },
         { -1, NULL, 0, NULL }
 };
@@ -358 +360 @@
         { SENSORS_SUBFEATURE_IN_MAX, NULL, 0, "max" },
         { SENSORS_SUBFEATURE_IN_CRIT, NULL, 0, "crit max" },
+        { SENSORS_SUBFEATURE_IN_AVERAGE, NULL, 0, "avg" },
+        { SENSORS_SUBFEATURE_IN_LOWEST, NULL, 0, "lowest" },
+        { SENSORS_SUBFEATURE_IN_HIGHEST, NULL, 0, "highest" },
         { -1, NULL, 0, NULL }
 };
@@ -652 +657 @@
         { SENSORS_SUBFEATURE_CURR_MAX, NULL, 0, "max" },
         { SENSORS_SUBFEATURE_CURR_CRIT, NULL, 0, "crit max" },
+        { SENSORS_SUBFEATURE_CURR_AVERAGE, NULL, 0, "avg" },
+        { SENSORS_SUBFEATURE_CURR_LOWEST, NULL, 0, "lowest" },
+        { SENSORS_SUBFEATURE_CURR_HIGHEST, NULL, 0, "highest" },
         { -1, NULL, 0, NULL }
 };