From 91033585d143ec2a0629bf3326413eae61c81dff Mon Sep 17 00:00:00 2001 From: Serhiy Mytrovtsiy Date: Sun, 13 Nov 2022 15:51:39 +0100 Subject: [PATCH] fix: add fans to the sensors list when initializing the sensors list --- Modules/Sensors/readers.swift | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Modules/Sensors/readers.swift b/Modules/Sensors/readers.swift index ac57ab75..aab7e4ce 100644 --- a/Modules/Sensors/readers.swift +++ b/Modules/Sensors/readers.swift @@ -45,7 +45,7 @@ internal class SensorsReader: Reader<[Sensor_p]> { private func sensors() -> [Sensor_p] { var available: [String] = SMC.shared.getAllKeys() - var list: [Sensor] = [] + var list: [Sensor_p] = [] var sensorsList = SensorsList if let platform = SystemKit.shared.device.platform { @@ -53,7 +53,7 @@ internal class SensorsReader: Reader<[Sensor_p]> { } if let count = SMC.shared.getValue("FNum") { - self.loadFans(Int(count)) + list += self.loadFans(Int(count)) } available = available.filter({ (key: String) -> Bool in @@ -109,7 +109,7 @@ internal class SensorsReader: Reader<[Sensor_p]> { } var results: [Sensor_p] = [] - results += list.filter({ (s: Sensor) -> Bool in + results += list.filter({ (s: Sensor_p) -> Bool in if s.type == .temperature && (s.value == 0 || s.value > 110) { return false } else if s.type == .current && s.value > 100 { @@ -279,9 +279,10 @@ internal class SensorsReader: Reader<[Sensor_p]> { // MARK: - Fans extension SensorsReader { - private func loadFans(_ count: Int) { + private func loadFans(_ count: Int) -> [Sensor_p] { debug("Found \(Int(count)) fans", log: self.log) + var list: [Fan] = [] for i in 0.. FanMode {