iStats 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50aba391f0764e8149790c7cc387ab03d1fa5b43
-  data.tar.gz: ab72f3980510dfeccfa08d19436a1522826bcada
+  metadata.gz: 3d4524a43b23dc2f8c2ec7214001e9f167efdee9
+  data.tar.gz: d73cade1cc7a3cc4004e1fd39f6ac7b2d0e579a2
 SHA512:
-  metadata.gz: 8c3a931e317a03b919d8c1e9066b8786a43f635e9d7a75cdb3acd9f8832344db016b5ede940f8a4dade6a1a339330cd6908b207ee10273882ca2e0e5b33f4be1
-  data.tar.gz: 32694d5487bba3e4c4f60b230c193cb300088625d0149e8554cdab298dae97db4838099c2fd7c7016bc32db41313700630c42dc4e6f5d5bcfc39ff8897eb8e78
+  metadata.gz: 43be157566d393bcaf162bf0f8609e7526f469c814dca9a1aad59453a9c124827b7893117a4f8190acee93cca0cf59038a2709ad49d6eb33293f2b81e23648c4
+  data.tar.gz: d5ddf3e45144678fa0b7f5fd8752ea1741660b3d7416ae521f67e02ba01dd54ebeb49d34cd7c2b3ec8b2eda53ad733facc6b4ca4224a18c979f3e371254102c6

data/ext/osx_stats/smc.c

@@ -44,22 +44,14 @@ UInt32 _strtoul(char *str, int size, int base)
     return total;
 }
 
-float _strtof(unsigned char *str, int size, int e)
-{
-    float total = 0;
-    int i;
-
-    for (i = 0; i < size; i++)
-    {
-        if (i == (size - 1))
-            total += (str[i] & 0xff) >> e;
-        else
-            total += str[i] << (size - 1 - i) * (8 - e);
-    }
-
-	total += (str[size-1] & 0x03) * 0.25;
-
-    return total;
+float _flttof(unsigned char *str) {
+    fltUnion flt;
+    flt.b[0] = str[0];
+    flt.b[1] = str[1];
+    flt.b[2] = str[2];
+    flt.b[3] = str[3];
+
+    return flt.f;
 }
 
 void _ultostr(char *str, UInt32 val)
@@ -193,11 +185,25 @@ float SMCGetFanSpeed(int fanNum)
 {
     SMCVal_t val;
     kern_return_t result;
-
     UInt32Char_t  key;
     sprintf(key, SMC_KEY_FAN_SPEED, fanNum);
+
     result = SMCReadKey(key, &val);
-    return _strtof(val.bytes, val.dataSize, 2);
+    if (result == kIOReturnSuccess) {
+        // read succeeded - check returned value
+        if (val.dataSize > 0) {
+            if (strcmp(val.dataType, DATATYPE_FPE2) == 0) {
+                // convert fpe2 value to rpm
+                int intValue = (unsigned char)val.bytes[0] * 256 + (unsigned char)val.bytes[1];
+                return intValue / 4.0;
+            } else if (strcmp(val.dataType, DATATYPE_FLT) == 0) {
+                // 2018 models have the ftp type for this key
+                return _flttof((unsigned char *)val.bytes);
+            }
+        }
+    }
+    // read failed
+    return 0.0;
 }
 
 int SMCGetFanNumber(char *key)
@@ -327,10 +333,9 @@ VALUE BATTERY_STATS = Qnil;
  * We never call this, Ruby does.
 */
 void Init_osx_stats() {
-    
     SMC_INFO = rb_define_module("SMC_INFO");
     rb_define_method(SMC_INFO,"is_key_supported",method_SMCKeySupported,1);
-    
+
     CPU_STATS = rb_define_module("CPU_STATS");
     rb_define_method(CPU_STATS, "get_cpu_temp", method_get_cpu_temp, 0);
 
@@ -347,13 +352,12 @@ void Init_osx_stats() {
     rb_define_method(BATTERY_STATS, "get_battery_charge", method_get_battery_charge, 0);
 }
 
-VALUE method_SMCKeySupported(VALUE self, VALUE key)
-{
+VALUE method_SMCKeySupported(VALUE self, VALUE key) {
     char *keyString = RSTRING_PTR(key);
     SMCOpen();
     double temp = SMCGetTemperature(keyString);
     SMCClose();
-    
+
     return rb_float_new(temp);
 }
 

data/ext/osx_stats/smc.h

@@ -36,14 +36,16 @@
 #define DATATYPE_UINT16       "ui16"
 #define DATATYPE_UINT32       "ui32"
 #define DATATYPE_SP78         "sp78"
+#define DATATYPE_FLT          "flt "
 
 // key values
 #define SMC_KEY_CPU_TEMP      "TC0P"
 #define SMC_KEY_FAN_SPEED     "F%dAc"
+#define SMC_KEY_MIN_FAN_SPEED "F%dMn"
+#define SMC_KEY_MAX_FAN_SPEED "F%dMx"
 #define SMC_KEY_FAN_NUM       "FNum"
 #define SMC_KEY_BATTERY_TEMP  "TB0T"
 
-
 typedef struct {
     char                  major;
     char                  minor;
@@ -89,6 +91,11 @@ typedef struct {
     SMCBytes_t              bytes;
 } SMCVal_t;
 
+typedef union _data {
+    float f;
+    char  b[4];
+} fltUnion;
+
 // prototypes
 float SMCGetFanSpeed(int fanNum);
 int SMCGetFanNumber(char *key);

data/lib/iStats/version.rb

@@ -1,3 +1,3 @@
 module IStats
-  VERSION = '1.5.2'
+  VERSION = '1.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iStats
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Chris911
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2018-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sparkr
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Stats for your mac