Merge pull request #9 from narugit/feature/use_tc0abxz

feat: Use other sensors when the temperature gets 0.0
narugit · Jun 12, 2023 · 74b5210 · 74b5210
2 parents 9b9f73b + 7756490
commit 74b5210
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/smctemp.cc b/smctemp.cc
@@ -27,6 +27,7 @@
 #include <cmath>
 #include <iomanip>
 #include <iostream>
+#include <limits>
 #include <string>
 #include <vector>
 
@@ -403,9 +404,19 @@ double SmcTemp::GetCpuTemp() {
     temp += smc_accessor_.ReadValue(sensor.c_str());
   }
   temp /= sensors.size();
-  if (temp < 110.0) {
+  if (temp > std::numeric_limits<double>::epsilon()) {
     return temp;
   }
+  std::vector<std::string> aux_sensors{
+    static_cast<std::string>(kSensorTc0a),
+    static_cast<std::string>(kSensorTc0b),
+    static_cast<std::string>(kSensorTc0x),
+    static_cast<std::string>(kSensorTc0z),
+  };
+  for (auto sensor : aux_sensors) {
+    temp += smc_accessor_.ReadValue(sensor.c_str());
+  }
+  temp /= aux_sensors.size();
 #endif
   return temp;
 }

diff --git a/smctemp.h b/smctemp.h
@@ -50,6 +50,10 @@ constexpr UInt32Char_t kSensorTc0e = "TC0E"; // CPU PECI die filtered temperatur
 constexpr UInt32Char_t kSensorTc0f = "TC0F"; // CPU PECI die temperature filtered then adjusted
 constexpr UInt32Char_t kSensorTc0p = "TC0P"; // CPU proximity temperature
 #elif defined(ARCH_TYPE_ARM64)
+constexpr UInt32Char_t kSensorTc0a = "Tc0a";
+constexpr UInt32Char_t kSensorTc0b = "Tc0b";
+constexpr UInt32Char_t kSensorTc0x = "Tc0x";
+constexpr UInt32Char_t kSensorTc0z = "Tc0z";
 constexpr UInt32Char_t kSensorTp01 = "Tp01"; // CPU performance core 1 temperature
 constexpr UInt32Char_t kSensorTp05 = "Tp05"; // CPU performance core 2 temperature
 constexpr UInt32Char_t kSensorTp0d = "Tp0D"; // CPU performance core 3 temperature