Skip to content

Add fan sensors #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add fan sensors #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions SensorsKit/SensorHistoryData.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,14 @@ public class SensorHistoryData: NSObject, Synchronizable
case voltage
case current
case ambiantLight
case rpm

public var description: String
{
switch self
{
case .thermal: return "thermal"
case .rpm: return "rpm"
case .voltage: return "voltage"
case .current: return "current"
case .ambiantLight: return "ambiantLight"
Expand Down
4 changes: 4 additions & 0 deletions SensorsKit/Sensors.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,13 @@ public class Sensors: NSObject

private var shouldRun = true
private var completion: ( () -> Void )?
private var regexFanRPM: NSRegularExpression

@objc
public override init()
{
self.regexFanRPM = try! NSRegularExpression( pattern: "F[0-9]Ac" )

super.init()

DispatchQueue.global( qos: .background ).async
Expand Down Expand Up @@ -114,6 +117,7 @@ public class Sensors: NSObject
let all = SMC.shared.readAllKeys()

all.filter { $0.keyName.hasPrefix( "T" ) }.forEach { self.addSensorHistoryData( data: $0, kind: .thermal ) }
all.filter { self.regexFanRPM.firstMatch(in: $0.keyName, range: NSMakeRange(0, $0.keyName.count)) != nil }.forEach { self.addSensorHistoryData( data: $0, kind: .rpm ) }
all.filter { $0.keyName.hasPrefix( "V" ) }.forEach { self.addSensorHistoryData( data: $0, kind: .voltage ) }
all.filter { $0.keyName.hasPrefix( "I" ) }.forEach { self.addSensorHistoryData( data: $0, kind: .current ) }
}
Expand Down