From 96db37bb3b958298d223164df00d93462fd0b7a8 Mon Sep 17 00:00:00 2001 From: Serhiy Mytrovtsiy Date: Fri, 1 Dec 2023 19:31:20 +0100 Subject: [PATCH] feat: added m2 and m3 sensors to the CPU temperature reader (#1698) --- Modules/CPU/readers.swift | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Modules/CPU/readers.swift b/Modules/CPU/readers.swift index cef48c4e..4da2d4dc 100644 --- a/Modules/CPU/readers.swift +++ b/Modules/CPU/readers.swift @@ -248,6 +248,20 @@ public class ProcessReader: Reader<[TopProcess]> { } public class TemperatureReader: Reader { + var list: [String] = [] + + public override func setup() { + switch SystemKit.shared.device.platform { + case .m1, .m1Pro, .m1Max, .m1Ultra: + self.list = ["Tp09", "Tp0T", "Tp01", "Tp05", "Tp0D", "Tp0H", "Tp0L", "Tp0P", "Tp0X", "Tp0b"] + case .m2, .m2Pro, .m2Max, .m2Ultra: + self.list = ["Tp0A", "Tp0D", "Tp0E", "Tp01", "Tp02", "Tp05", "Tp06", "Tp09"] + case .m3, .m3Pro, .m3Max, .m3Ultra: + self.list = ["Te05", "Te0L", "Te0P", "Te0S", "Tf04", "Tf09", "Tf0A", "Tf0B", "Tf0D", "Tf0E", "Tf44", "Tf49", "Tf4A", "Tf4B", "Tf4D", "Tf4E"] + default: break + } + } + public override func read() { var temperature: Double? = nil @@ -262,10 +276,9 @@ public class TemperatureReader: Reader { } else if let value = SMC.shared.getValue("TC0H"), value < 110 { temperature = value } else { - #if arch(arm64) var total: Double = 0 var counter: Double = 0 - ["Tp09", "Tp0T", "Tp01", "Tp05", "Tp0D", "Tp0H", "Tp0L", "Tp0P", "Tp0X", "Tp0b"].forEach { (key: String) in + self.list.forEach { (key: String) in if let value = SMC.shared.getValue(key) { total += value counter += 1 @@ -274,7 +287,6 @@ public class TemperatureReader: Reader { if total != 0 && counter != 0 { temperature = total / counter } - #endif } self.callback(temperature)