Changeset 4559

Timestamp:

07/05/07 23:03:06 (6 years ago)

Author:

jwrdegoede

Message:

Better generic print fault handling

Location:

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors

Files:

• chips.c (modified) (3 diffs)
• chips_generic.c (modified) (5 diffs)

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/chips.c

@@ -23 +23 @@
 #include <stdlib.h>
 #include <string.h>
+#include <math.h>
 
 #include "chips.h"
@@ -42 +43 @@
                      int minmax, int curprec, int limitprec)
 {
+   /* note: deg_ctof() will preserve HUGEVAL */
    if (fahrenheit) {
       n_cur  = deg_ctof(n_cur);
@@ -48 +50 @@
    }
 
-/* use %* to pass precision as an argument */
+   /* use %* to pass precision as an argument */
+   if (n_cur != HUGE_VAL)
+      printf("%+6.*f%s  ", curprec, n_cur, degstr);
+   else
+      printf("FAULT     ");
+
    if(minmax == MINMAX)
-        printf("%+6.*f%s  (low  = %+5.*f%s, high = %+5.*f%s)  ",
-            curprec, n_cur, degstr,
+        printf("(low  = %+5.*f%s, high = %+5.*f%s)  ",
             limitprec, n_hyst, degstr,
             limitprec, n_over, degstr);
    else if(minmax == MAXONLY)
-        printf("%+6.*f%s  (high = %+5.*f%s)                  ",
-            curprec, n_cur, degstr,
+        printf("(high = %+5.*f%s)                  ",
             limitprec, n_over, degstr);
    else if(minmax == CRIT)
-        printf("%+6.*f%s  (high = %+5.*f%s, crit = %+5.*f%s)  ",
-            curprec, n_cur, degstr,
+        printf("(high = %+5.*f%s, crit = %+5.*f%s)  ",
             limitprec, n_over, degstr,
             limitprec, n_hyst, degstr);
    else if(minmax == HYST)
-        printf("%+6.*f%s  (high = %+5.*f%s, hyst = %+5.*f%s)  ",
-            curprec, n_cur, degstr,
+        printf("(high = %+5.*f%s, hyst = %+5.*f%s)  ",
             limitprec, n_over, degstr,
             limitprec, n_hyst, degstr);
-   else if(minmax == SINGLE)
-        printf("%+6.*f%s",
-            curprec, n_cur, degstr);
    else if(minmax == HYSTONLY)
-        printf("%+6.*f%s  (hyst = %+5.*f%s)                  ",
-            curprec, n_cur, degstr,
+        printf("(hyst = %+5.*f%s)                  ",
             limitprec, n_over, degstr);
-   else
+   else if(minmax != SINGLE)
         printf("Unknown temperature mode!");
 }

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/chips_generic.c

@@ -22 +22 @@
 #include <stdlib.h>
 #include <string.h>
+#include <math.h>
 
 #include "chips_generic.h"
@@ -152 +153 @@
   }
   
+  if (TEMP_FEATURE(SENSORS_FEATURE_TEMP_FAULT) &&
+      TEMP_FEATURE_VAL(SENSORS_FEATURE_TEMP_FAULT))
+    val = HUGE_VAL;
+  
   print_label(label, label_size);
   free(label);
@@ -170 +175 @@
   }
   
-  /* ALARM and FAULT features */
-  if (TEMP_FEATURE(SENSORS_FEATURE_TEMP_FAULT) &&
-      TEMP_FEATURE_VAL(SENSORS_FEATURE_TEMP_FAULT) > 0.5) {
-    printf(" FAULT");
-  } else
+  /* ALARM features */
   if ((TEMP_FEATURE(SENSORS_FEATURE_TEMP_ALARM) && 
        TEMP_FEATURE_VAL(SENSORS_FEATURE_TEMP_ALARM) > 0.5)
@@ -315 +316 @@
   print_label(label, label_size);
   free(label);
-  printf("%4.0f RPM", val);
+
+  if (FAN_FEATURE(SENSORS_FEATURE_FAN_FAULT) &&
+      FAN_FEATURE_VAL(SENSORS_FEATURE_FAN_FAULT))
+    printf("FAULT   ");
+  else
+    printf("%4.0f RPM", val);
   
   sensors_get_available_features(name, feature, i, j, has_features, feature_vals,
@@ -330 +336 @@
     printf("  (div = %1.0f)", FAN_FEATURE_VAL(SENSORS_FEATURE_FAN_DIV));
   
-  /* ALARM and FAULT features */
-  if (FAN_FEATURE(SENSORS_FEATURE_FAN_FAULT) &&
-      FAN_FEATURE_VAL(SENSORS_FEATURE_FAN_FAULT)) {
-    printf(" FAULT");
-  } else
   if (FAN_FEATURE(SENSORS_FEATURE_FAN_ALARM) && 
       FAN_FEATURE_VAL(SENSORS_FEATURE_FAN_ALARM)) {