added Catalina fan fix from alkurbatov lavoiesl#30

BourgonLaurent · Jul 26, 2020 · a6b714b · a6b714b
1 parent 1ed274f
commit a6b714b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/smc.c b/smc.c
@@ -222,6 +222,10 @@ float SMCGetFanRPM(char* key)
     if (result == kIOReturnSuccess) {
         // read succeeded - check returned value
         if (val.dataSize > 0) {
+            if (strcmp(val.dataType, DATATYPE_FLT) == 0) {
+                return *((float*)val.bytes);
+            }
+
             if (strcmp(val.dataType, DATATYPE_FPE2) == 0) {
                 // convert fpe2 value to RPM
                 return ntohs(*(UInt16*)val.bytes) / 4.0;
@@ -276,10 +280,8 @@ void readAndPrintFanRPMs(void)
             if (rpm < 0.f) {
                 rpm = 0.f;
             }
-            float pct = rpm / (maximum_speed - minimum_speed);
 
-            pct *= 100.f;
-            printf("Fan %d - %s at %.0f RPM (%.0f%%)\n", i, name, rpm, pct);
+            printf("Fan %d - %s at %.0f RPM (%.0f%%)\n", i, name, actual_speed, 100 * actual_speed / maximum_speed);
 
             //sprintf(key, "F%dSf", i);
             //SMCReadKey(key, &val);

diff --git a/smc.h b/smc.h
@@ -32,6 +32,7 @@
 #define SMC_CMD_READ_PLIMIT 11
 #define SMC_CMD_READ_VERS 12
 
+#define DATATYPE_FLT "flt "
 #define DATATYPE_FPE2 "fpe2"
 #define DATATYPE_UINT8 "ui8 "
 #define DATATYPE_UINT16 "ui16"