Changed -f option to -F, added -C for Celsius, and updated README

chandlerc · Sep 16, 2015 · 273cb59 · 273cb59
1 parent 7e80ce9
commit 273cb59
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # OSX CPU Temp
 
-Outputs current CPU temperature in °C for OSX
+Outputs current CPU temperature for OSX.
 
 ## Usage 
 
@@ -28,6 +28,11 @@ osx-cpu-temp
 61.8°C
 ```
 
+### Options
+
+ * `-C` Output temperature in Celsius (default).
+ * `-F` Output temperature in Fahrenheit.
+
 ## Maintainer 
 
 Sébastien Lavoie <sebastien@lavoie.sl>

diff --git a/smc.c b/smc.c
@@ -170,12 +170,14 @@ double convertToFahrenheit(double celsius) {
 
 int main(int argc, char *argv[])
 {
-    bool fahrenheit = false;
+    char scale = 'C';
+
     int c;
-    while ((c = getopt(argc, argv, "f")) != -1) {
-      switch(c) {
-        case 'f':
-          fahrenheit = true;
+    while ((c = getopt(argc, argv, "CF")) != -1) {
+      switch (c) {
+        case 'F':
+        case 'C':
+          scale = c;
           break;
       }
     }
@@ -184,10 +186,8 @@ int main(int argc, char *argv[])
     double temperature = SMCGetTemperature(SMC_KEY_CPU_TEMP);
     SMCClose();
 
-    char scale = 'C';
-    if (fahrenheit) {
+    if (scale == 'F') {
       temperature = convertToFahrenheit(temperature);
-      scale = 'F';
     }
 
     printf("%0.1f°%c\n", temperature, scale);