From 72ec960b1c05c184b89caf458ddcb731049b842c Mon Sep 17 00:00:00 2001 From: SI Creative Date: Sun, 21 Oct 2018 22:09:40 +0800 Subject: [PATCH 1/5] Type of flt should with one space --- Shared/smc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Shared/smc.h b/Shared/smc.h index 01e089a1..2b282453 100644 --- a/Shared/smc.h +++ b/Shared/smc.h @@ -54,7 +54,7 @@ #define SMC_TYPE_SI32 "si32" #define SMC_TYPE_FLAG "flag" #define SMC_TYPE_FDS "{fds" -#define SMC_TYPE_FLT "flt" +#define SMC_TYPE_FLT "flt " #define SMC_TYPE_FPXX_SIZE 2 #define SMC_TYPE_SPXX_SIZE 2 From 96e1531f8c5c36074f6d8e9e5cebc9137876ea12 Mon Sep 17 00:00:00 2001 From: SI Creative Date: Sun, 21 Oct 2018 22:15:22 +0800 Subject: [PATCH 2/5] support 2018 mbp --- HWMonitor/HWMEngine.m | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/HWMonitor/HWMEngine.m b/HWMonitor/HWMEngine.m index 15310148..6cbb9999 100644 --- a/HWMonitor/HWMEngine.m +++ b/HWMonitor/HWMEngine.m @@ -1799,6 +1799,29 @@ - (void)insertSmcFansWithConnection:(io_connect_t)connection keys:(NSSet*)keys } } } + }else { + key = [[NSString alloc] initWithFormat:@KEY_FORMAT_FAN_SPEED,i]; + if (kIOReturnSuccess == SMCReadKey(connection, [key cStringUsingEncoding:NSASCIIStringEncoding], &info)) { + NSString *type = [NSString stringWithCString:info.dataType encoding:NSASCIIStringEncoding]; + if ([type isEqualToString:@SMC_TYPE_FLT]){ + NSString * caption = [[NSString alloc] initWithBytes:info.bytes length:info.dataSize encoding:NSUTF8StringEncoding]; + + if ([caption length] == 0) + caption = [[NSString alloc] initWithFormat:@"Fan %X", i + 1]; + + if (![caption hasPrefix:@"GPU "]) { + + key = [[NSString alloc] initWithFormat:@KEY_FORMAT_FAN_SPEED,i]; + + if (kIOReturnSuccess == SMCReadKey(connection, [key cStringUsingEncoding:NSASCIIStringEncoding], &info)) { + + type = [NSString stringWithCString:info.dataType encoding:NSASCIIStringEncoding]; + + [self insertSmcFanWithConnection:connection descriptor:caption name:key type:type title:GetLocalizedString(caption) selector:group.selector.unsignedIntegerValue group:group]; + } + } + } + } } } From 15b6f11768f7c1f7f8904f20486f7f459528a279 Mon Sep 17 00:00:00 2001 From: SI Creative Date: Sun, 21 Oct 2018 22:20:02 +0800 Subject: [PATCH 3/5] Create MacBookPro15,1 --- HWMonitor/Profiles/MacBookPro15,1 | 80 +++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 HWMonitor/Profiles/MacBookPro15,1 diff --git a/HWMonitor/Profiles/MacBookPro15,1 b/HWMonitor/Profiles/MacBookPro15,1 new file mode 100644 index 00000000..e25134e5 --- /dev/null +++ b/HWMonitor/Profiles/MacBookPro15,1 @@ -0,0 +1,80 @@ + + + + + TC1C|CPU Core 1 + TC2C|CPU Core 2 + TC3C|CPU Core 3 + TC4C|CPU Core 4 + TC5C|CPU Core 5 + TC6C|CPU Core 6 + TA0V|Ambient + Ts0P|Heatpipe Incoming Air + TC0P|CPU Proximity + TC0E|CPU 1 + TC0F|CPU 2 + TCHP|Heatsink + TCSC|PECI SA + TCXC|PECI CPU + TCSA|PECI SA + TCGC|PECI GPU + TPCD|PCH Die + TM0P|Memory + Ts0S|System Proximity + Th0N|SSD + TB0T|Battery TS Max + TB1T|Battery 1 + TBXT|Battery + TB2T|Battery 2 + Th2H|Fan inlet Left + Ts0P|Touchpad + Th1H|Fan inlet Right + Ts1P|Palm + VCFR|CPU FIVR + VD0R|Power Supply + VCAC|CPU + VCGC|Graphic + VG0C|GPU + VP0R|VSDC + IBLR|LCD BL + ICAM|CPU IMON + IO5R|5V + IO3R|3V + ICAC|CPU Fixed + IC0R|Computing High Side + ITAR|TrackPad + ICMC|Camera + ICGC|CPU Graphic + IHCC|PICCOLO + IHNC|NAND + IIDC|T151 + ICEC|EDRAM + IG0R|GPU + ID0R|DC in + IO0R|Other High Side + IBKC|KB backlite + ISCC|PCH + IULC|Thunderbolt Left + PSDC|SSD + PAPC|Airport + PM0C|Memory + PC1C|CPU 1.05V + PD0R|Power Supply + PC0R|CPU Rail + PCAC|CPU Process + P03R|3V + P05R|5V + PG0R|GPU + PCPC|CPU Package Cores + PCGM|CPU Memory Controller + PCGC|CPU Graphic + PCPG|CPU Package Graphics + PCPT|CPU Package Total + PM0C|Memory Rail + PN0C|PCH Core + PC0R|Mainboard S0 Rail + PDTR|DC in Total + PSTR|System Total + PCS0|CPU 1.8V + + From 3a5281c4820c212534ec2bac7952ce91ec0eda7c Mon Sep 17 00:00:00 2001 From: SI Creative Date: Sun, 21 Oct 2018 22:20:53 +0800 Subject: [PATCH 4/5] Create MacBookPro15,2.plist --- HWMonitor/Profiles/MacBookPro15,2.plist | 80 +++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 HWMonitor/Profiles/MacBookPro15,2.plist diff --git a/HWMonitor/Profiles/MacBookPro15,2.plist b/HWMonitor/Profiles/MacBookPro15,2.plist new file mode 100644 index 00000000..e25134e5 --- /dev/null +++ b/HWMonitor/Profiles/MacBookPro15,2.plist @@ -0,0 +1,80 @@ + + + + + TC1C|CPU Core 1 + TC2C|CPU Core 2 + TC3C|CPU Core 3 + TC4C|CPU Core 4 + TC5C|CPU Core 5 + TC6C|CPU Core 6 + TA0V|Ambient + Ts0P|Heatpipe Incoming Air + TC0P|CPU Proximity + TC0E|CPU 1 + TC0F|CPU 2 + TCHP|Heatsink + TCSC|PECI SA + TCXC|PECI CPU + TCSA|PECI SA + TCGC|PECI GPU + TPCD|PCH Die + TM0P|Memory + Ts0S|System Proximity + Th0N|SSD + TB0T|Battery TS Max + TB1T|Battery 1 + TBXT|Battery + TB2T|Battery 2 + Th2H|Fan inlet Left + Ts0P|Touchpad + Th1H|Fan inlet Right + Ts1P|Palm + VCFR|CPU FIVR + VD0R|Power Supply + VCAC|CPU + VCGC|Graphic + VG0C|GPU + VP0R|VSDC + IBLR|LCD BL + ICAM|CPU IMON + IO5R|5V + IO3R|3V + ICAC|CPU Fixed + IC0R|Computing High Side + ITAR|TrackPad + ICMC|Camera + ICGC|CPU Graphic + IHCC|PICCOLO + IHNC|NAND + IIDC|T151 + ICEC|EDRAM + IG0R|GPU + ID0R|DC in + IO0R|Other High Side + IBKC|KB backlite + ISCC|PCH + IULC|Thunderbolt Left + PSDC|SSD + PAPC|Airport + PM0C|Memory + PC1C|CPU 1.05V + PD0R|Power Supply + PC0R|CPU Rail + PCAC|CPU Process + P03R|3V + P05R|5V + PG0R|GPU + PCPC|CPU Package Cores + PCGM|CPU Memory Controller + PCGC|CPU Graphic + PCPG|CPU Package Graphics + PCPT|CPU Package Total + PM0C|Memory Rail + PN0C|PCH Core + PC0R|Mainboard S0 Rail + PDTR|DC in Total + PSTR|System Total + PCS0|CPU 1.8V + + From f47487a341e4bbe88c94a3432b5c32bcb776d76e Mon Sep 17 00:00:00 2001 From: SI Creative Date: Sun, 21 Oct 2018 22:21:15 +0800 Subject: [PATCH 5/5] Rename MacBookPro15,1 to MacBookPro15,1.plist --- HWMonitor/Profiles/{MacBookPro15,1 => MacBookPro15,1.plist} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename HWMonitor/Profiles/{MacBookPro15,1 => MacBookPro15,1.plist} (100%) diff --git a/HWMonitor/Profiles/MacBookPro15,1 b/HWMonitor/Profiles/MacBookPro15,1.plist similarity index 100% rename from HWMonitor/Profiles/MacBookPro15,1 rename to HWMonitor/Profiles/MacBookPro15,1.plist