Changeset 1954

Timestamp:

08/09/03 23:21:32 (10 years ago)

Author:

khali

Message:

Add tcrit and alarms support to lm83.

New print_temp_info mode (CRIT, for high+crit).

Files:

• lm-sensors/trunk/prog/sensors/chips.c (modified) (7 diffs)

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

@@ -54 +54 @@
 #define MINMAX 1
 #define MAXONLY 2
+#define CRIT 3
 /* minmax = 0 for limit/hysteresis, 1 for max/min, 2 for max only;
    curprec and limitprec are # of digits after decimal point
@@ -81 +82 @@
             curprec, n_cur, degv,
             limitprec + 4, limitprec, n_over, degv);
+   else if(minmax == CRIT)
+        printf( "%+6.*f%s  (limit = %+*.*f%s, critical = %+*.*f%s)  ",
+            curprec, n_cur, degv,
+            limitprec + 4, limitprec, n_over, degv,
+            limitprec + 4, limitprec, n_hyst, degv);
    else /* HYST */
         printf( "%+6.*f%s  (limit = %+*.*f%s, hysteresis = %+*.*f%s)",
@@ -4298 +4304 @@
 {
   char *label;
-  double cur,high;
-  int valid;
+  double cur,high,crit;
+  int valid,alarms;
+
+  if (!sensors_get_feature(*name,SENSORS_LM83_ALARMS,&cur))
+    alarms = cur + 0.5;
+  else {
+    printf("ERROR: Can't get alarm data!\n");
+    alarms = 0;
+  }
+
+  if (sensors_get_feature(*name,SENSORS_LM83_TCRIT,&crit)) {
+    printf("ERROR: Can't get tcrit data!\n");
+    crit = 127;
+  }
 
   if (!sensors_get_label_and_valid(*name,SENSORS_LM83_LOCAL_TEMP,&label,&valid) &&
@@ -4306 +4324 @@
     if (valid) {
       print_label(label,10);
-      print_temp_info( cur, high, 0, MAXONLY, 0, 0);
-      printf( "\n" );
+      print_temp_info( cur, high, crit, CRIT, 0, 0);
+      printf(" %s\n",
+        alarms&LM83_ALARM_LOCAL_CRIT?"CRITICAL":
+        alarms&LM83_ALARM_LOCAL_HIGH?"ALARM":"");
     }
   } else
@@ -4318 +4338 @@
     if (valid) {
       print_label(label,10);
-      print_temp_info( cur, high, 0, MAXONLY, 0, 0);
-      printf( "\n" );
+      print_temp_info( cur, high, crit, CRIT, 0, 0);
+      printf(" %s\n",
+        alarms&LM83_ALARM_REMOTE1_OPEN?"DISCONNECT":
+        alarms&LM83_ALARM_REMOTE1_CRIT?"CRITICAL":
+        alarms&LM83_ALARM_REMOTE1_HIGH?"ALARM":"");
     }
   } else
@@ -4330 +4353 @@
     if (valid) {
       print_label(label,10);
-      print_temp_info( cur, high, 0, MAXONLY, 0, 0);
-      printf( "\n" );
+      print_temp_info( cur, high, crit, CRIT, 0, 0);
+      printf(" %s\n",
+        alarms&LM83_ALARM_REMOTE2_OPEN?"DISCONNECT":
+        alarms&LM83_ALARM_REMOTE2_CRIT?"CRITICAL":
+        alarms&LM83_ALARM_REMOTE2_HIGH?"ALARM":"");
     }
   } else
@@ -4342 +4368 @@
     if (valid) {
       print_label(label,10);
-      print_temp_info( cur, high, 0, MAXONLY, 0, 0);
-      printf( "\n" );
+      print_temp_info( cur, high, crit, CRIT, 0, 0);
+      printf(" %s\n",
+        alarms&LM83_ALARM_REMOTE3_OPEN?"DISCONNECT":
+        alarms&LM83_ALARM_REMOTE3_CRIT?"CRITICAL":
+        alarms&LM83_ALARM_REMOTE3_HIGH?"ALARM":"");
     }
   } else