Skip to content

Commit b02c76b

Browse files
sergiyesergiye
committed
Add limited support for MSI MEG Z790 GODLIKE MAX
* Rename M2_1 to M2 #1 in temperature readings
1 parent cd72350 commit b02c76b

File tree

5 files changed

+66
-9
lines changed

5 files changed

+66
-9
lines changed

‎OpenHardwareMonitorLib/Hardware/Motherboard/Identification.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,8 @@ public static Model GetModel(string name)
687687
return Model.X870E_CARBON_WIFI;
688688
case var _ when name.Equals("MPG X870E EDGE TI WIFI (MS-7E59)", StringComparison.OrdinalIgnoreCase):
689689
return Model.X870E_EDGE_TI_WIFI;
690+
case var _ when name.Equals("MEG Z790 GODLIKE MAX (MS-7D85)", StringComparison.OrdinalIgnoreCase):
691+
return Model.Z790_GODLIKE_MAX;
690692
case var _ when name.Equals("MEG Z890 ACE (MS-7E22)", StringComparison.OrdinalIgnoreCase):
691693
return Model.Z890_ACE;
692694
case var _ when name.Equals("MAG Z890 TOMAHAWK WIFI (MS-7E32)", StringComparison.OrdinalIgnoreCase):

‎OpenHardwareMonitorLib/Hardware/Motherboard/Lpc/Nct677X.cs‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ public Nct677X(LpcPort lpcPort, Chip chip, byte revision, ushort port)
344344
Fans = new float?[16];
345345
Controls = new float?[8];
346346
Voltages = new float?[14];
347-
Temperatures = new float?[7];
347+
Temperatures = new float?[11];
348348

349349
// CPU
350350
// System
@@ -353,14 +353,22 @@ public Nct677X(LpcPort lpcPort, Chip chip, byte revision, ushort port)
353353
// CPU Socket
354354
// PCIE_1
355355
// M2_1
356+
// PCIE_1
357+
// PCIE_2
358+
// M2_1
359+
// M2_4
356360
_temperaturesSource = new TemperatureSourceData[] {
357361
new(null, 0x100),
358362
new(null, 0x102),
359363
new(null, 0x104),
360364
new(null, 0x106),
361365
new(null, 0x108),
362366
new(null, 0x10A),
363-
new(null, 0x10C)
367+
new(null, 0x10C),
368+
new(null, 0x10E),
369+
new(null, 0x110),
370+
new(null, 0x112),
371+
new(null, 0x114)
364372
};
365373

366374
// VIN0 +12V

‎OpenHardwareMonitorLib/Hardware/Motherboard/Model.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ public enum Model
155155
X870P_PRO_WIFI,
156156
X870E_CARBON_WIFI,
157157
X870E_EDGE_TI_WIFI,
158+
Z790_GODLIKE_MAX,
158159
Z890_ACE,
159160
Z890_TOMAHAWK_WIFI,
160161
Z890_CARBON_WIFI,

‎OpenHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs‎

Lines changed: 52 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,52 @@ private static void GetBoardSpecificConfiguration
528528

529529
break;
530530

531+
case Manufacturer.MSI when model == Model.Z790_GODLIKE_MAX: // NCT6687D
532+
v.Add(new Voltage("+12V", 0));
533+
v.Add(new Voltage("+5V", 1));
534+
v.Add(new Voltage("Vcore", 2));
535+
v.Add(new Voltage("Voltage #1", 3));
536+
v.Add(new Voltage("DIMM", 4));
537+
v.Add(new Voltage("CPU I/O", 5));
538+
v.Add(new Voltage("CPU System Agent", 6));
539+
v.Add(new Voltage("Voltage #2", 7));
540+
v.Add(new Voltage("AVCC3", 8));
541+
v.Add(new Voltage("CPU Termination", 9));
542+
v.Add(new Voltage("VRef", 10));
543+
v.Add(new Voltage("VSB", 11));
544+
v.Add(new Voltage("AVSB", 12));
545+
v.Add(new Voltage("CMOS Battery", 13));
546+
547+
t.Add(new Temperature("CPU", 0));
548+
t.Add(new Temperature("System", 1));
549+
t.Add(new Temperature("VRM MOS", 2));
550+
t.Add(new Temperature("PCH", 3));
551+
t.Add(new Temperature("CPU Socket", 4));
552+
t.Add(new Temperature("PCIe #1", 7));
553+
t.Add(new Temperature("PCIe #2", 8));
554+
t.Add(new Temperature("M2 #1", 9));
555+
t.Add(new Temperature("M2 #4", 10));
556+
557+
f.Add(new Fan("CPU Fan", 0));
558+
f.Add(new Fan("Pump Fan", 1));
559+
f.Add(new Fan("System Fan #1", 2));
560+
f.Add(new Fan("System Fan #2", 3));
561+
f.Add(new Fan("System Fan #3", 4));
562+
f.Add(new Fan("System Fan #4", 5));
563+
f.Add(new Fan("System Fan #5", 6));
564+
f.Add(new Fan("System Fan #6", 7));
565+
566+
c.Add(new Control("CPU Fan", 0));
567+
c.Add(new Control("Pump Fan", 1));
568+
c.Add(new Control("System Fan #1", 2));
569+
c.Add(new Control("System Fan #2", 3));
570+
c.Add(new Control("System Fan #3", 4));
571+
c.Add(new Control("System Fan #4", 5));
572+
c.Add(new Control("System Fan #5", 6));
573+
c.Add(new Control("System Fan #6", 7));
574+
575+
break;
576+
531577
default:
532578
v.Add(new Voltage("+12V", 0));
533579
v.Add(new Voltage("+5V", 1));
@@ -550,7 +596,7 @@ private static void GetBoardSpecificConfiguration
550596
t.Add(new Temperature("PCH", 3));
551597
t.Add(new Temperature("CPU Socket", 4));
552598
t.Add(new Temperature("PCIe x1", 5));
553-
t.Add(new Temperature("M2_1", 6));
599+
t.Add(new Temperature("M2 #1", 6));
554600

555601
f.Add(new Fan("CPU Fan", 0));
556602
f.Add(new Fan("Pump Fan", 1));
@@ -642,7 +688,7 @@ private static void GetBoardSpecificConfiguration
642688
v.Add(new Voltage("CMOS Battery", 13));
643689

644690
t.Add(new Temperature("PCIe x1", 5));
645-
t.Add(new Temperature("M2_1", 6));
691+
t.Add(new Temperature("M2 #1", 6));
646692

647693
break;
648694

@@ -666,7 +712,7 @@ private static void GetBoardSpecificConfiguration
666712

667713
t.Add(new Temperature("CPU Socket", 4));
668714
t.Add(new Temperature("PCIe x1", 5));
669-
t.Add(new Temperature("M2_1", 6));
715+
t.Add(new Temperature("M2 #1", 6));
670716

671717
break;
672718

@@ -2498,7 +2544,7 @@ private static void GetIteConfigurationsB(ISuperIO superIO, Manufacturer manufac
24982544
v.Add(new Voltage("+5V", 6));
24992545
t.Add(new Temperature("CPU", 0));
25002546
t.Add(new Temperature("PCH", 1));
2501-
t.Add(new Temperature("PCIEX16", 2));
2547+
t.Add(new Temperature("PCIe x16", 2));
25022548
t.Add(new Temperature("System #1", 3));
25032549
t.Add(new Temperature("System #2", 4));
25042550
t.Add(new Temperature("VRAM MOS", 5));
@@ -5373,7 +5419,7 @@ private static void GetNuvotonConfigurationD(ISuperIO superIO, Manufacturer manu
53735419

53745420
case Model.X570_Gaming_Plus:
53755421
// NCT6797D
5376-
// NCT771x : PCIE 1, M.2 1, not supported
5422+
// NCT771x : PCIe 1, M.2 1, not supported
53775423
// RF35204 : VRM not supported
53785424

53795425
v.Add(new Voltage("Vcore", 0));
@@ -5419,7 +5465,7 @@ private static void GetNuvotonConfigurationD(ISuperIO superIO, Manufacturer manu
54195465
case Model.X570_MS7C35:
54205466
// NCT6797D
54215467
// NCT7802Y (on SMBus): SYS_FAN5, CPU 1.8V, Chipset SOC, Chipset CLDO - not supported
5422-
// Unknown: PCIE 1, PCIE 3, M.2_1
5468+
// Unknown: PCIe 1, PCIe 3, M.2_1
54235469

54245470
v.Add(new Voltage("Vcore", 0)); // CPUVCORE
54255471
v.Add(new Voltage("+5V", 1, 12, 3)); // VIN1

‎clean.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ del /s OpenHardwareMonitor.sln.DotSettings.user
1313
git reflog expire --expire=1.days.ago --expire-unreachable=now --all
1414
if errorlevel 1 goto error
1515

16-
git gc
16+
git gc --prune=now
1717
if errorlevel 1 goto error
1818

1919
goto exit

0 commit comments

Comments
 (0)