Changeset 928

Timestamp:

11/13/00 19:31:48 (13 years ago)

Author:

frodo

Message:

Display stuff as Fahrenheits; patch of Kelsey Hudson

<khudson@… >

Location:

lm-sensors/trunk/prog/sensors

Files:

• chips.c (modified) (27 diffs)
• main.c (modified) (5 diffs)
• sensors.1 (modified) (1 diff)

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

@@ -29 +29 @@
 static void print_label(const char *label, int space);
 static void free_the_label(char **label);
+static void print_temp_info( float, float, float );
+static inline float deg_ctof( float );
+
+extern int fahrenheit;
 
 char *spacestr(int n)
@@ -38 +42 @@
   buf[n] = '\0';
   return buf;
+}
+
+inline float deg_ctof( float cel )
+{
+   return ( cel * ( 9.0F / 5.0F ) + 32.0F );
+}
+
+void print_temp_info( float cur, float over, float hyst )
+{
+   char degv[5];
+
+   float n_cur, 
+         n_over, 
+         n_hyst;
+
+   if ( fahrenheit )
+   {
+      sprintf( degv, "%cF", 176 );
+      n_cur  = deg_ctof( cur  );
+      n_over = deg_ctof( over );
+      n_hyst = deg_ctof( hyst );
+   }
+   else
+   {
+      sprintf( degv, "%cC", 176 );
+      n_cur  = cur;
+      n_over = over;
+      n_hyst = hyst;
+   }
+
+   printf( "%+3.0f%s     (limit = %+3.0f%s,  hysteresis = %+3.0f%s)",
+           n_cur, degv, n_over, degv, n_hyst, degv );
 }
 
@@ -82 +118 @@
     if (valid) {
       print_label(label,10);
-      printf("%6.1f C (limit: %6.1f C, hysteresis: %6.1f C)\n",
-             cur,over,hyst);
+      print_temp_info( cur, over, hyst );
+      printf( "\n" );
     }
   } else
@@ -109 +145 @@
     if (valid) {
       print_label(label,10);
-      printf("%4.0f C (limit: %4.0f C, hysteresis: %4.0f C)    ",
-             cur,over,hyst);
+      print_temp_info( cur, over, hyst );
       if (alarms & (ADM1021_ALARM_TEMP_HIGH | ADM1021_ALARM_TEMP_LOW)) {
         printf("ALARM (");
@@ -135 +170 @@
     if (valid) {
       print_label(label,10);
-      printf("%4.0f C (limit: %4.0f C, hysteresis: %4.0f C)    ",
-             cur,over,hyst);
+      print_temp_info( cur, over, hyst );
       if (alarms & (ADM1021_ALARM_RTEMP_HIGH | ADM1021_ALARM_RTEMP_LOW |
                     ADM1021_ALARM_RTEMP_NA)) {
@@ -192 +226 @@
     if (valid) {
       print_label(label,10);
-      printf("%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
+      printf( "%+6.2f V  (min = %+6.2f V, max = %+6.2f V)   %s\n",
              cur,min,max,alarms&ADM9240_ALARM_IN0?"ALARM":"");
     }
@@ -290 +324 @@
     if (valid) {
       print_label(label,10);
-      printf("%+3.0f C     (limit = %+3.0f C,  hysteresis = %+3.0f C) %s\n",
-             cur,max,min, alarms&ADM9240_ALARM_TEMP?"ALARM":"");
+      print_temp_info( cur, min, max );
+      printf( " %s\n", alarms & ADM9240_ALARM_TEMP ? "ALARM" : "" );
     }
   } else
@@ -409 +443 @@
     if (valid) {
       print_label(label,10);
-      printf("%+3.0f C     (limit = %+3.0f C,  hysteresis = %+3.0f C) %s\n",
-             cur,max,min, alarms&SIS5595_ALARM_TEMP?"ALARM":"");
+      print_temp_info( cur, min, max );
+      printf( " %s\n", alarms & SIS5595_ALARM_TEMP ? "ALARM" : "" );
     }
   } else
@@ -531 +565 @@
     if (valid) {
       print_label(label,10);
-      printf("%+3.1f C     (limit = %+3.0f C,  hysteresis = %+3.0f C) %s\n",
-             cur,max,min, alarms&VIA686A_ALARM_TEMP?"ALARM":"");
+      print_temp_info( cur, min, max );
+      printf(" %s\n", alarms & VIA686A_ALARM_TEMP ? "ALARM" : "" );
     }
   } else
@@ -543 +577 @@
     if (valid) {
       print_label(label,10);
-      printf("%+3.1f C     (limit = %+3.0f C,  hysteresis = %+3.0f C) %s\n",
-             cur,max,min, alarms&VIA686A_ALARM_TEMP2?"ALARM":"");
+      print_temp_info( cur, min, max );
+      printf(" %s\n", alarms & VIA686A_ALARM_TEMP2 ? "ALARM" : "" );
     }
   } else
@@ -555 +589 @@
     if (valid) {
       print_label(label,10);
-      printf("%+3.1f C     (limit = %+3.0f C,  hysteresis = %+3.0f C) %s\n",
-             cur,max,min, alarms&VIA686A_ALARM_TEMP3?"ALARM":"");
+      print_temp_info( cur, min, max );
+      printf(" %s\n", alarms & VIA686A_ALARM_TEMP3 ? "ALARM" : "" );
     }
   } else
@@ -706 +740 @@
     if (valid) {
       print_label(label,10);
-      printf("%+3.0f C     (limit = %+3.0f C,  hysteresis = %+3.0f C) %s\n",
-             cur,max,min, alarms&LM78_ALARM_TEMP?"ALARM":"");
+      print_temp_info( cur, max, min );
+      printf( " %s\n", alarms & LM78_ALARM_TEMP ? "ALARM" : "" );
     }
   } else
@@ -899 +933 @@
     if (valid) {
       print_label(label,10);
-      printf("%+3.0f C     (limit = %+3.0f C,  hysteresis = %+3.0f C) %s  %s\n",
-             cur,max,min, alarms&GL518_ALARM_TEMP?"ALARM":"     ",
+      print_temp_info( cur, max, min );
+      printf("%s  %s\n", alarms&GL518_ALARM_TEMP?"ALARM":"     ",
              beeps&GL518_ALARM_TEMP?"(beep)":"");
     }
@@ -1013 +1047 @@
     if (valid) {
       print_label(label,10);
-      printf("%+3.0f C   (limit = %+3.0f C, hysteresis = %+3.0f C) %s\n",
-           cur,max,min, alarms&ADM1025_ALARM_TEMP?"ALARM":"");
+      print_temp_info( cur, max, min );
+      printf(" %s\n", alarms&ADM1025_ALARM_TEMP?"ALARM":"");
     }
   } else
@@ -1153 +1187 @@
     if (valid) {
       print_label(label,10);
-      printf("%+3.2f C (hot:limit = %+3.0f C,  hysteresis = %+3.0f C) %s\n",
+
+      if ( fahrenheit )
+      {
+      printf("%+3.2f°C (hot:limit = %+3.0f°F,  hysteresis = %+3.0f°F) %s\n",
+           deg_ctof(cur),deg_ctof(max),deg_ctof(min), alarms&LM80_ALARM_TEMP_HOT?"ALARM":"");
+    printf("         (os: limit = %+3.0f°F,  hysteresis = %+3.0f°F) %s\n",
+           deg_ctof(max2),deg_ctof(min2), alarms&LM80_ALARM_TEMP_HOT?"ALARM":"");
+      }
+      else
+      {
+      printf("%+3.2f °C (hot:limit = %+3.0f°C,  hysteresis = %+3.0f°C) %s\n",
            cur,max,min, alarms&LM80_ALARM_TEMP_HOT?"ALARM":"");
-    printf("         (os: limit = %+3.0f C,  hysteresis = %+3.0f C) %s\n",
+    printf("         (os: limit = %+3.0f°C,  hysteresis = %+3.0f°C) %s\n",
            max2,min2, alarms&LM80_ALARM_TEMP_HOT?"ALARM":"");
+      }
     }
   } else
@@ -1318 +1363 @@
     if (valid) {
       print_label(label,10);
-      printf("%+6.0f C  (limit = %+3.0f C,  hysteresis = %+3.0f C) %s\n",
-             cur,max,min, alarms&MTP008_ALARM_TEMP1?"ALARM":"");
+      print_temp_info( cur, max, min );
+      printf(" %s\n", alarms&MTP008_ALARM_TEMP1?"ALARM":"");
     }
   } else
@@ -1331 +1376 @@
     if (valid) {
       print_label(label,10);
-      printf("%+6.0f C  (limit = %+3.0f C,  hysteresis = %+3.0f C) %s\n",
-             cur,max,min, alarms&MTP008_ALARM_TEMP2?"ALARM":"");
+      print_temp_info( cur, max, min );
+      printf(" %s\n", alarms&MTP008_ALARM_TEMP2?"ALARM":"");
     }
   } else
@@ -1344 +1389 @@
     if (valid) {
       print_label(label,10);
-      printf("%+6.0f C  (limit = %+3.0f C,  hysteresis = %+3.0f C) %s\n",
-             cur,max,min, alarms&MTP008_ALARM_TEMP3?"ALARM":"");
+      print_temp_info( cur, max, min );
+      printf(" %s\n", alarms&MTP008_ALARM_TEMP3?"ALARM":"");
     }
   } else
@@ -1508 +1553 @@
       }
     } else
-      printf("ERROR: Can't get IN6 data!\n");
+      printf("ERROR: Can't get IN8 data!\n");
     free_the_label(&label);
   }
@@ -1559 +1604 @@
       if((!is82d) && (!is83s)) {
         print_label(label,10);
-        printf("%+3.0f C   (limit = %+3.0f C, hysteresis = %+3.0f C) %s  %s\n",
-               cur,max,min, alarms&W83781D_ALARM_TEMP1 ?"ALARM":"     ",
+        print_temp_info( cur, max, min );
+        printf(" %s  %s\n", alarms&W83781D_ALARM_TEMP1 ?"ALARM":"     ",
                beeps&W83781D_ALARM_TEMP1?"(beep)":"");
       } else {
         if(!sensors_get_feature(*name,SENSORS_W83781D_SENS1,&sens)) {
           print_label(label,10);
-          printf(
-  "%+3.0f C  (limit = %+3.0f C, hysteresis = %+3.0f C, sensor = %s) %s  %s\n",
-                 cur,max,min,
+          print_temp_info( cur, max, min );
+          printf( " sensor = %s   %s   %s\n",
                  (((int)sens)==1)?"PII/Celeron diode":(((int)sens)==2)?
                  "3904 transistor":"thermistor",
@@ -1588 +1632 @@
       if((!is82d) && (!is83s)) {
         print_label(label,10);
-        printf("%+3.1f C   (limit = %+3.1f C, hysteresis = %+3.1f C) %s  %s\n",
-               cur,max,min, alarms&W83781D_ALARM_TEMP23 ?"ALARM":"     ",
-               beeps&W83781D_ALARM_TEMP23?"(beep)":"");
+        print_temp_info( cur, max, min );
+        printf(" %s  %s\n", alarms&W83781D_ALARM_TEMP2 ?"ALARM":"     ",
+               beeps&W83781D_ALARM_TEMP2?"(beep)":"");
       } else {
         if(!sensors_get_feature(*name,SENSORS_W83781D_SENS2,&sens)) {
           print_label(label,10);
-          printf(
-  "%+3.1f C  (limit = %+3.1f C, hysteresis = %+3.1f C, sensor = %s) %s  %s\n",
-                 cur,max,min,
+          print_temp_info( cur, max, min );
+          printf( " sensor = %s   %s   %s\n",
                  (((int)sens)==1)?"PII/Celeron diode":(((int)sens)==2)?
                  "3904 transistor":"thermistor",
@@ -1618 +1661 @@
         if(!is82d) {
           print_label(label,10);
-          printf("%+3.1f C   (limit = %+3.1f C, hysteresis = %+3.1f C) %s  %s\n",
-                 cur,max,min, alarms&W83781D_ALARM_TEMP23 ?"ALARM":"     ",
-                 beeps&W83781D_ALARM_TEMP23?"(beep)":"");
+          print_temp_info( cur, max, min );
+          printf(" %s  %s\n", alarms&W83781D_ALARM_TEMP2 ?"ALARM":"     ",
+                 beeps&W83781D_ALARM_TEMP3?"(beep)":"");
         } else {
           if(!sensors_get_feature(*name,SENSORS_W83781D_SENS3,&sens)) {
             print_label(label,10);
-            printf(
-  "%+3.1f C  (limit = %+3.1f C, hysteresis = %+3.1f C, sensor = %s) %s  %s\n",
-                   cur,max,min,
+            print_temp_info( cur, max, min );
+            printf( " sensor = %s   %s   %s\n",
                    (((int)sens)==1)?"PII/Celeron diode":(((int)sens)==2)?
                    "3904 transistor":"thermistor",
@@ -1692 +1734 @@
       if (valid && (cur || max || min)) {
          print_label(label, 12);
-         printf("%+3.1f C     (limit = %+3.1f C, hysteresis = %+3.1f C)\n",
-                cur, max, min);
+         print_temp_info( cur, max, min );
+         printf("\n");
       }
    } else
@@ -1705 +1747 @@
       if (valid && (cur || max || min)) {
          print_label(label, 12);
-         printf("%+3.1f C     (limit = %+3.1f C, hysteresis = %+3.1f C) %s\n",
-                cur, max, min, alarms&MAXI_ALARM_TEMP2 ? "ALARM" : "");
+         print_temp_info( cur, max, min );
+         printf(" %s\n", alarms&MAXI_ALARM_TEMP2 ? "ALARM" : "");
       }
    } else
@@ -1718 +1760 @@
       if (valid && (cur || max || min)) {
          print_label(label, 12);
-         printf("%+3.1f C     (limit = %+3.1f C, hysteresis = %+3.1f C)\n",
-                cur, max, min);
+         print_temp_info( cur, max, min );
+         printf("\n");
       }
    } else
@@ -1731 +1773 @@
       if (valid && (cur || max || min)) {
          print_label(label, 12);
-         printf("%+3.1f C     (limit = %+3.1f C, hysteresis = %+3.1f C) %s\n",
-                cur, max, min, alarms&MAXI_ALARM_TEMP4 ? "ALARM" : "");
+         print_temp_info( cur, max, min );
+         printf(" %s\n", alarms&MAXI_ALARM_TEMP4 ? "ALARM" : "");
       }
    } else
@@ -1744 +1786 @@
       if (valid && (cur || max || min)) {
          print_label(label, 12);
-         printf("%+3.1f C     (limit = %+3.1f C, hysteresis = %+3.1f C) %s\n",
-                cur, max, min, alarms&MAXI_ALARM_TEMP5 ? "ALARM" : "");
+         print_temp_info( cur, max, min );
+         printf(" %s\n", alarms&MAXI_ALARM_TEMP5 ? "ALARM" : "");
       }
    } else

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

@@ -52 +52 @@
 sensors_chip_name chips[CHIPS_MAX];
 int chips_count=0;
-int do_sets, do_unknown;
+int do_sets, do_unknown, fahrenheit;
 
 void print_short_help(void)
@@ -65 +65 @@
   printf("  -h, --help            Display this help text\n");
   printf("  -s, --set             Execute `set' statements too (root only)\n");
+  printf("  -f, --fahrenheit      Show temperatures in degrees fahrenheit\n" );
   printf("  -u, --unknown         Treat chips as unknown ones (testing only)\n");
   printf("  -v, --version         Display the program version\n");
@@ -137 +138 @@
     { "set", no_argument, NULL, 's' },
     { "version", no_argument, NULL, 'v'},
+    { "fahrenheit", no_argument, NULL, 'f' },
     { "config-file", required_argument, NULL, 'c' },
     { "unknown", required_argument, NULL, 'u' },
@@ -145 +147 @@
   do_sets = 0;
   while (1) {
-    c = getopt_long(argc,argv,"hvusc:",long_opts,NULL);
+    c = getopt_long(argc,argv,"hvufsc:",long_opts,NULL);
     if (c == EOF)
       break;
@@ -164 +166 @@
     case 's':
       do_sets = 1;
+      break;
+    case 'f':
+      fahrenheit = 1;
       break;
     case 'u':

lm-sensors/trunk/prog/sensors/sensors.1

@@ -65 +65 @@
 .IP -v
 Returns the program version.
+.IP -f
+Prints the temperatures in degrees Fahrenheit instead of Celsius.
 .SH FILES
 .I /etc/sensors.conf