morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-14 00:04:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: fan mode detection on start

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2022-02-04 18:36:39 +01:00
parent b2dbf41531
commit 0da6f3c4b2
1 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
Modules/Sensors/readers.swift
View File

@@ -33,31 +33,7 @@ internal class SensorsReader: Reader<[Sensor_p]> {
#endif
if let count = SMC.shared.getValue("FNum") {
debug("Found \(Int(count)) fans", log: self.log)
for i in 0..<Int(count) {
var name = SMC.shared.getStringValue("F\(i)ID")
if name == nil && count == 2 {
switch i {
case 0:
name = localizedString("Left fan")
case 1:
name = localizedString("Right fan")
default: break
}
}
self.list.append(Fan(
id: i,
key: "F\(i)Ac",
name: name ?? "\(localizedString("Fan")) #\(i)",
minSpeed: SMC.shared.getValue("F\(i)Mn") ?? 1,
maxSpeed: SMC.shared.getValue("F\(i)Mx") ?? 1,
value: SMC.shared.getValue("F\(i)Ac") ?? 0,
mode: self.getFanMode(i)
))
}
self.loadFans(Int(count))
}
available = available.filter({ (key: String) -> Bool in
@@ -174,6 +150,41 @@ internal class SensorsReader: Reader<[Sensor_p]> {
self.callback(self.list)
}
private func loadFans(_ count: Int) {
debug("Found \(Int(count)) fans", log: self.log)
for i in 0..<Int(count) {
var name = SMC.shared.getStringValue("F\(i)ID")
var mode: FanMode
if name == nil && count == 2 {
switch i {
case 0:
name = localizedString("Left fan")
case 1:
name = localizedString("Right fan")
default: break
}
}
if let md = SMC.shared.getValue("F\(i)Md") {
mode = FanMode(rawValue: Int(md)) ?? .automatic
} else {
mode = self.getFanMode(i)
}
self.list.append(Fan(
id: i,
key: "F\(i)Ac",
name: name ?? "\(localizedString("Fan")) #\(i)",
minSpeed: SMC.shared.getValue("F\(i)Mn") ?? 1,
maxSpeed: SMC.shared.getValue("F\(i)Mx") ?? 1,
value: SMC.shared.getValue("F\(i)Ac") ?? 0,
mode: mode
))
}
}
private func getFanMode(_ id: Int) -> FanMode {
let fansMode: Int = Int(SMC.shared.getValue("FS! ") ?? 0)
var mode: FanMode = .automatic