alihan/hot-cputemp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed useless reading of IOHID properties.

Browse Source
This commit is contained in:
macmade
2023-02-06 19:34:46 +01:00
parent eb261cec9d
commit 5407dc4db3
4 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Hot/Classes/IOHID/IOHID.m
View File

@@ -109,15 +109,13 @@ NS_ASSUME_NONNULL_END
for( id o in services )
{
IOHIDServiceClientRef service = ( __bridge IOHIDServiceClientRef )o;
NSString * name = CFBridgingRelease( IOHIDServiceClientCopyProperty( service, CFSTR( "Product" ) ) );
NSArray * keys = @[ @"IOClass", @"IOProviderClass", @"IONameMatch", @"Product", @"DeviceUsagePairs" ];
NSDictionary * properties = CFBridgingRelease( IOHIDServiceClientCopyProperties( service, ( __bridge CFArrayRef )keys ) );
IOHIDServiceClientRef service = ( __bridge IOHIDServiceClientRef )o;
NSString * name = CFBridgingRelease( IOHIDServiceClientCopyProperty( service, CFSTR( "Product" ) ) );
CFTypeRef event = IOHIDServiceClientCopyEvent( service, eventType, 0, 0 );
if( name != nil && event != nil )
{
values[ name ] = [ [ IOHIDData alloc ] initWithName: name value: IOHIDEventGetFloatValue( event, eventField ) properties: properties ];
values[ name ] = [ [ IOHIDData alloc ] initWithName: name value: IOHIDEventGetFloatValue( event, eventField ) ];
}
if( event != nil )

8
Hot/Classes/IOHID/IOHIDData.swift
View File

@@ -27,15 +27,13 @@ import Foundation
@objc
public class IOHIDData: NSObject
{
@objc public dynamic var name: String
@objc public dynamic var value: Double
@objc public dynamic var properties: [ AnyHashable: Any ]
@objc public dynamic var name: String
@objc public dynamic var value: Double
@objc
public init( name: String, value: Double, properties: [ AnyHashable: Any ] )
public init( name: String, value: Double )
{
self.name = name
self.value = value
self.properties = properties
}
}

16
Hot/Classes/SensorsWindow/SensorHistoryData.swift
View File

@@ -61,10 +61,9 @@ public class SensorHistoryData: NSObject, Synchronizable
}
}
@objc public private( set ) dynamic var source: Source
@objc public private( set ) dynamic var kind: Kind
@objc public private( set ) dynamic var name: String
@objc public private( set ) dynamic var properties: [ AnyHashable: Any ]?
@objc public private( set ) dynamic var source: Source
@objc public private( set ) dynamic var kind: Kind
@objc public private( set ) dynamic var name: String
private var data: [ Double ] = []
@@ -119,12 +118,11 @@ public class SensorHistoryData: NSObject, Synchronizable
}
@objc
public init( source: Source, kind: Kind, name: String, properties: [ AnyHashable: Any ]? )
public init( source: Source, kind: Kind, name: String )
{
self.source = source
self.kind = kind
self.name = name
self.properties = properties
self.source = source
self.kind = kind
self.name = name
}
@objc( addValue: )

4
Hot/Classes/SensorsWindow/Sensors.swift
View File

@@ -115,7 +115,7 @@ public class Sensors: NSObject
if self.sensors[ key ] == nil
{
self.sensors[ key ] = SensorHistoryData( source: .hid, kind: kind, name: data.name, properties: data.properties )
self.sensors[ key ] = SensorHistoryData( source: .hid, kind: kind, name: data.name )
}
self.sensors[ key ]?.add( value: data.value )
@@ -142,7 +142,7 @@ public class Sensors: NSObject
if self.sensors[ key ] == nil
{
self.sensors[ key ] = SensorHistoryData( source: .smc, kind: kind, name: data.keyName, properties: [ : ] )
self.sensors[ key ] = SensorHistoryData( source: .smc, kind: kind, name: data.keyName )
}
self.sensors[ key ]?.add( value: value )