Skip to content

Commit 6759a07

Browse files
vectorsigma72vectorsigma72
committed
HWMonitorSMC2.app v2.6.1
- Behaviour follow Intel Power Gadget.app showing sensors (PMU is turned on by default). - Corrected plots for wattages. - Plots allowed for smc voltages. - Plots have new theme(s). - Main view resizing with left aligment for the values for a better reading. - Added Asus P8Z77-v LX and Gigabyte Z370M DS3H-CF configurations.
1 parent 050a27f commit 6759a07

File tree

24 files changed

+358
-159
lines changed

24 files changed

+358
-159
lines changed

‎HWMonitorSMC.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,7 @@
10201020
CODE_SIGN_ENTITLEMENTS = "";
10211021
CODE_SIGN_IDENTITY = "-";
10221022
COPY_PHASE_STRIP = NO;
1023-
CURRENT_PROJECT_VERSION = 2.6.0;
1023+
CURRENT_PROJECT_VERSION = 2.6.1;
10241024
DEBUG_INFORMATION_FORMAT = dwarf;
10251025
ENABLE_STRICT_OBJC_MSGSEND = YES;
10261026
ENABLE_TESTABILITY = YES;
@@ -1039,7 +1039,7 @@
10391039
GCC_WARN_UNUSED_FUNCTION = YES;
10401040
GCC_WARN_UNUSED_VARIABLE = YES;
10411041
MACOSX_DEPLOYMENT_TARGET = 10.10;
1042-
MODULE_VERSION = 2.6.0;
1042+
MODULE_VERSION = 2.6.1;
10431043
MTL_ENABLE_DEBUG_INFO = YES;
10441044
ONLY_ACTIVE_ARCH = YES;
10451045
OTHER_SWIFT_FLAGS = "";
@@ -1087,7 +1087,7 @@
10871087
CODE_SIGN_ENTITLEMENTS = "";
10881088
CODE_SIGN_IDENTITY = "-";
10891089
COPY_PHASE_STRIP = NO;
1090-
CURRENT_PROJECT_VERSION = 2.6.0;
1090+
CURRENT_PROJECT_VERSION = 2.6.1;
10911091
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
10921092
ENABLE_NS_ASSERTIONS = NO;
10931093
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1100,7 +1100,7 @@
11001100
GCC_WARN_UNUSED_FUNCTION = YES;
11011101
GCC_WARN_UNUSED_VARIABLE = YES;
11021102
MACOSX_DEPLOYMENT_TARGET = 10.10;
1103-
MODULE_VERSION = 2.6.0;
1103+
MODULE_VERSION = 2.6.1;
11041104
MTL_ENABLE_DEBUG_INFO = NO;
11051105
ONLY_ACTIVE_ARCH = NO;
11061106
OTHER_SWIFT_FLAGS = "";
@@ -1120,7 +1120,7 @@
11201120
CODE_SIGN_IDENTITY = "-";
11211121
CODE_SIGN_STYLE = Automatic;
11221122
COMBINE_HIDPI_IMAGES = YES;
1123-
CURRENT_PROJECT_VERSION = 2.6.0;
1123+
CURRENT_PROJECT_VERSION = 2.6.1;
11241124
FRAMEWORK_SEARCH_PATHS = (
11251125
"$(inherited)",
11261126
"$(LOCAL_LIBRARY_DIR)/Frameworks",
@@ -1130,8 +1130,8 @@
11301130
INFOPLIST_FILE = HWMonitorSMC/Info.plist;
11311131
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
11321132
MACOSX_DEPLOYMENT_TARGET = 10.10;
1133-
MARKETING_VERSION = 2.6.0;
1134-
MODULE_VERSION = 2.5.2;
1133+
MARKETING_VERSION = 2.6.1;
1134+
MODULE_VERSION = 2.6.1;
11351135
OTHER_SWIFT_FLAGS = "";
11361136
PRODUCT_BUNDLE_IDENTIFIER = org.slice.HWMonitorSMC2;
11371137
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1150,7 +1150,7 @@
11501150
CODE_SIGN_IDENTITY = "-";
11511151
CODE_SIGN_STYLE = Automatic;
11521152
COMBINE_HIDPI_IMAGES = YES;
1153-
CURRENT_PROJECT_VERSION = 2.6.0;
1153+
CURRENT_PROJECT_VERSION = 2.6.1;
11541154
FRAMEWORK_SEARCH_PATHS = (
11551155
"$(inherited)",
11561156
"$(LOCAL_LIBRARY_DIR)/Frameworks",
@@ -1161,8 +1161,8 @@
11611161
INFOPLIST_FILE = HWMonitorSMC/Info.plist;
11621162
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
11631163
MACOSX_DEPLOYMENT_TARGET = 10.10;
1164-
MARKETING_VERSION = 2.6.0;
1165-
MODULE_VERSION = 2.5.2;
1164+
MARKETING_VERSION = 2.6.1;
1165+
MODULE_VERSION = 2.6.1;
11661166
OTHER_SWIFT_FLAGS = "";
11671167
PRODUCT_BUNDLE_IDENTIFIER = org.slice.HWMonitorSMC2;
11681168
PRODUCT_NAME = "$(TARGET_NAME)";

‎HWMonitorSMC/HWMonitorSensors/HWMonitorSensor.swift‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,6 @@ enum HWSensorType : Int {
8989
case usb = 30
9090
}
9191

92-
//MARK: - log type
93-
enum HWSensorScope : Int {
94-
case normal = 0
95-
case min = 1
96-
case max = 2
97-
case everage = 3
98-
}
99-
10092
//MARK: - HWMonitorSensor
10193
class HWMonitorSensor: NSObject {
10294
private var isFavoriteSensor : Bool = false
@@ -107,8 +99,7 @@ class HWMonitorSensor: NSObject {
10799
var sensorType : HWSensorType
108100
var outLine: HWOulineView?
109101
var favorite: Bool = false
110-
111-
var scope : HWSensorScope = .normal
102+
112103
var actionType : ActionType = .nothing
113104
var unit : HWUnit
114105
var doubleValue : Double = 0

‎HWMonitorSMC/HWMonitorSensors/HWSensorScanner.swift‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class HWSensorsScanner: NSObject {
113113
func getMemory() -> [HWMonitorSensor] {
114114
var arr = [HWMonitorSensor]()
115115
let percentage : Bool = UDs.bool(forKey: "useMemoryPercentage")
116-
let unit : HWUnit = percentage ? HWUnit.Percent : HWUnit.MB
116+
let unit : HWUnit = percentage ? .Percent : .MB
117117
let sensorType : HWSensorType = .memory
118118
let actionType : ActionType = .memoryLog
119119
let type = "RAM"
@@ -299,7 +299,7 @@ class HWSensorsScanner: NSObject {
299299
sensorType: .voltage,
300300
title: "Voltage".locale,
301301
actionType: actionType,
302-
canPlot: false,
302+
canPlot: AppSd.sensorsInited ? false : true,
303303
index: -1,
304304
list: &main)
305305

@@ -309,7 +309,7 @@ class HWSensorsScanner: NSObject {
309309
sensorType: .voltage,
310310
title: "VRM Voltage".locale,
311311
actionType: actionType,
312-
canPlot: false,
312+
canPlot: AppSd.sensorsInited ? false : true,
313313
index: -1,
314314
list: &main)
315315

@@ -506,7 +506,7 @@ class HWSensorsScanner: NSObject {
506506
sensorType: .voltage,
507507
title: "PRAM Battery".locale,
508508
actionType: actionType,
509-
canPlot: false,
509+
canPlot: AppSd.sensorsInited ? false : true,
510510
index: -1,
511511
list: &arr)
512512

@@ -516,7 +516,7 @@ class HWSensorsScanner: NSObject {
516516
sensorType: .voltage,
517517
title: "+12V Bus Voltage".locale,
518518
actionType: actionType,
519-
canPlot: false,
519+
canPlot: AppSd.sensorsInited ? false : true,
520520
index: -1,
521521
list: &arr)
522522

@@ -526,7 +526,7 @@ class HWSensorsScanner: NSObject {
526526
sensorType: .voltage,
527527
title: "+5V Bus Voltage".locale,
528528
actionType: actionType,
529-
canPlot: false,
529+
canPlot: AppSd.sensorsInited ? false : true,
530530
index: -1,
531531
list: &arr)
532532

@@ -536,7 +536,7 @@ class HWSensorsScanner: NSObject {
536536
sensorType: .voltage,
537537
title: "-12V Bus Voltage".locale,
538538
actionType: actionType,
539-
canPlot: false,
539+
canPlot: AppSd.sensorsInited ? false : true,
540540
index: -1,
541541
list: &arr)
542542

@@ -547,7 +547,7 @@ class HWSensorsScanner: NSObject {
547547
sensorType: .voltage,
548548
title: "-5V Bus Voltage".locale,
549549
actionType: actionType,
550-
canPlot: false,
550+
canPlot: AppSd.sensorsInited ? false : true,
551551
index: -1,
552552
list: &arr)
553553

@@ -557,7 +557,7 @@ class HWSensorsScanner: NSObject {
557557
sensorType: .voltage,
558558
title: "3.3 VCC Voltage".locale,
559559
actionType: actionType,
560-
canPlot: false,
560+
canPlot: AppSd.sensorsInited ? false : true,
561561
index: -1,
562562
list: &arr)
563563

@@ -567,7 +567,7 @@ class HWSensorsScanner: NSObject {
567567
sensorType: .voltage,
568568
title: "3.3 VSB Voltage".locale,
569569
actionType: actionType,
570-
canPlot: false,
570+
canPlot: AppSd.sensorsInited ? false : true,
571571
index: -1,
572572
list: &arr)
573573

@@ -577,7 +577,7 @@ class HWSensorsScanner: NSObject {
577577
sensorType: .voltage,
578578
title: "3.3 AVCC Voltage".locale,
579579
actionType: actionType,
580-
canPlot: false,
580+
canPlot: AppSd.sensorsInited ? false : true,
581581
index: -1,
582582
list: &arr)
583583

@@ -621,7 +621,7 @@ class HWSensorsScanner: NSObject {
621621
sensorType: .tachometer,
622622
title: withIndex,
623623
actionType: actionType,
624-
canPlot: false,
624+
canPlot: AppSd.sensorsInited ? false : true,
625625
index: i,
626626
list: &arr) {
627627

@@ -710,7 +710,7 @@ class HWSensorsScanner: NSObject {
710710
type: "LPCBFANS",
711711
sensorType: .tachometer,
712712
title: name,
713-
canPlot: true)
713+
canPlot: AppSd.sensorsInited ? false : true)
714714
s.actionType = actionType
715715
s.stringValue = String(format: "%.f", val)
716716
s.doubleValue = Double(val)
@@ -730,7 +730,7 @@ class HWSensorsScanner: NSObject {
730730
type: "LPCBVOLTAGES",
731731
sensorType: .voltage,
732732
title: name,
733-
canPlot: true)
733+
canPlot: AppSd.sensorsInited ? false : true)
734734
s.actionType = actionType
735735
s.stringValue = String(format: "%.3f", val)
736736
s.doubleValue = Double(val)
@@ -771,7 +771,7 @@ class HWSensorsScanner: NSObject {
771771
type: "BATT",
772772
sensorType: .voltage,
773773
title: "Voltage".locale,
774-
canPlot: true)
774+
canPlot: AppSd.sensorsInited ? false : true)
775775
s.actionType = actionType
776776
s.stringValue = String(format: "%.3f", Double(voltage) / 1000)
777777
s.doubleValue = Double(voltage) / 1000
@@ -785,7 +785,7 @@ class HWSensorsScanner: NSObject {
785785
type: "BATT",
786786
sensorType: .amperage,
787787
title: "Amperage".locale,
788-
canPlot: true)
788+
canPlot: AppSd.sensorsInited ? false : true)
789789

790790
s.actionType = actionType
791791
s.stringValue = String(format: "%.3f", Double(amperage) / 1000)

‎HWMonitorSMC/HWMonitorSensors/HWSensorsUpdate.swift‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,8 @@ extension PopoverViewController {
4545
if (newSensor.sensorType == sensorType) &&
4646
(newSensor.title == sensor?.title) &&
4747
(newSensor.key == sensor?.key) {
48-
switch newSensor.scope {
49-
case .min:
50-
//print("\(newSensor.title) = \(newSensor.doubleValue)")
51-
if newSensor.doubleValue > 0 && newSensor.doubleValue < sensor!.doubleValue {
52-
sensor?.stringValue = newSensor.stringValue
53-
sensor?.doubleValue = newSensor.doubleValue
54-
}
55-
case .max:
56-
if newSensor.doubleValue > sensor!.doubleValue {
57-
sensor?.stringValue = newSensor.stringValue
58-
sensor?.doubleValue = newSensor.doubleValue
59-
}
60-
default:
61-
sensor?.stringValue = newSensor.stringValue
62-
sensor?.doubleValue = newSensor.doubleValue
63-
}
64-
48+
sensor?.stringValue = newSensor.stringValue
49+
sensor?.doubleValue = newSensor.doubleValue
6550
}
6651
}
6752
}

0 commit comments

Comments
 (0)