diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs index 5649ca9..6ff360d 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs @@ -693,6 +693,8 @@ internal class Identification return Model.X870E_CARBON_WIFI; case var _ when name.Equals("MPG X870E EDGE TI WIFI (MS-7E59)", StringComparison.OrdinalIgnoreCase): return Model.X870E_EDGE_TI_WIFI; + case var _ when name.Equals("MEG Z790 GODLIKE MAX (MS-7D85)", StringComparison.OrdinalIgnoreCase): + return Model.Z790_GODLIKE_MAX; case var _ when name.Equals("MEG Z890 ACE (MS-7E22)", StringComparison.OrdinalIgnoreCase): return Model.Z890_ACE; case var _ when name.Equals("MAG Z890 TOMAHAWK WIFI (MS-7E32)", StringComparison.OrdinalIgnoreCase): diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Nct677X.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Nct677X.cs index 72004c5..49fc366 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Nct677X.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Nct677X.cs @@ -351,7 +351,7 @@ internal class Nct677X : ISuperIO Fans = new float?[16]; Controls = new float?[8]; Voltages = new float?[14]; - Temperatures = new float?[7]; + Temperatures = new float?[11]; // CPU // System @@ -360,6 +360,10 @@ internal class Nct677X : ISuperIO // CPU Socket // PCIE_1 // M2_1 + // PCIE_1 + // PCIE_2 + // M2_1 + // M2_4 _temperaturesSource = new TemperatureSourceData[] { new(null, 0x100), new(null, 0x102), @@ -367,7 +371,11 @@ internal class Nct677X : ISuperIO new(null, 0x106), new(null, 0x108), new(null, 0x10A), - new(null, 0x10C) + new(null, 0x10C), + new(null, 0x10E), + new(null, 0x110), + new(null, 0x112), + new(null, 0x114) }; // VIN0 +12V diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs index cc1ff5c..4ca3080 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs @@ -167,6 +167,7 @@ public enum Model X870P_PRO_WIFI, X870E_CARBON_WIFI, X870E_EDGE_TI_WIFI, + Z790_GODLIKE_MAX, Z890_ACE, Z890_TOMAHAWK_WIFI, Z890_CARBON_WIFI, diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs index 385e867..d44a08d 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs @@ -529,6 +529,52 @@ internal sealed class SuperIOHardware : Hardware break; + case Manufacturer.MSI when model == Model.Z790_GODLIKE_MAX: // NCT6687D + v.Add(new Voltage("+12V", 0)); + v.Add(new Voltage("+5V", 1)); + v.Add(new Voltage("Vcore", 2)); + v.Add(new Voltage("Voltage #1", 3)); + v.Add(new Voltage("DIMM", 4)); + v.Add(new Voltage("CPU I/O", 5)); + v.Add(new Voltage("CPU System Agent", 6)); + v.Add(new Voltage("Voltage #2", 7)); + v.Add(new Voltage("AVCC3", 8)); + v.Add(new Voltage("CPU Termination", 9)); + v.Add(new Voltage("VRef", 10)); + v.Add(new Voltage("VSB", 11)); + v.Add(new Voltage("AVSB", 12)); + v.Add(new Voltage("CMOS Battery", 13)); + + t.Add(new Temperature("CPU", 0)); + t.Add(new Temperature("System", 1)); + t.Add(new Temperature("VRM MOS", 2)); + t.Add(new Temperature("PCH", 3)); + t.Add(new Temperature("CPU Socket", 4)); + t.Add(new Temperature("PCIe #1", 7)); + t.Add(new Temperature("PCIe #2", 8)); + t.Add(new Temperature("M2 #1", 9)); + t.Add(new Temperature("M2 #4", 10)); + + f.Add(new Fan("CPU Fan", 0)); + f.Add(new Fan("Pump Fan", 1)); + f.Add(new Fan("System Fan #1", 2)); + f.Add(new Fan("System Fan #2", 3)); + f.Add(new Fan("System Fan #3", 4)); + f.Add(new Fan("System Fan #4", 5)); + f.Add(new Fan("System Fan #5", 6)); + f.Add(new Fan("System Fan #6", 7)); + + c.Add(new Control("CPU Fan", 0)); + c.Add(new Control("Pump Fan", 1)); + c.Add(new Control("System Fan #1", 2)); + c.Add(new Control("System Fan #2", 3)); + c.Add(new Control("System Fan #3", 4)); + c.Add(new Control("System Fan #4", 5)); + c.Add(new Control("System Fan #5", 6)); + c.Add(new Control("System Fan #6", 7)); + + break; + default: v.Add(new Voltage("+12V", 0)); v.Add(new Voltage("+5V", 1)); @@ -551,7 +597,7 @@ internal sealed class SuperIOHardware : Hardware t.Add(new Temperature("PCH", 3)); t.Add(new Temperature("CPU Socket", 4)); t.Add(new Temperature("PCIe x1", 5)); - t.Add(new Temperature("M2_1", 6)); + t.Add(new Temperature("M2 #1", 6)); f.Add(new Fan("CPU Fan", 0)); f.Add(new Fan("Pump Fan", 1)); @@ -643,7 +689,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("CMOS Battery", 13)); t.Add(new Temperature("PCIe x1", 5)); - t.Add(new Temperature("M2_1", 6)); + t.Add(new Temperature("M2 #1", 6)); break; @@ -667,7 +713,7 @@ internal sealed class SuperIOHardware : Hardware t.Add(new Temperature("CPU Socket", 4)); t.Add(new Temperature("PCIe x1", 5)); - t.Add(new Temperature("M2_1", 6)); + t.Add(new Temperature("M2 #1", 6)); break; @@ -2499,7 +2545,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("+5V", 6)); t.Add(new Temperature("CPU", 0)); t.Add(new Temperature("PCH", 1)); - t.Add(new Temperature("PCIEX16", 2)); + t.Add(new Temperature("PCIe x16", 2)); t.Add(new Temperature("System #1", 3)); t.Add(new Temperature("System #2", 4)); t.Add(new Temperature("VRAM MOS", 5)); @@ -5373,7 +5419,7 @@ internal sealed class SuperIOHardware : Hardware case Model.X570_Gaming_Plus: // NCT6797D - // NCT771x : PCIE 1, M.2 1, not supported + // NCT771x : PCIe 1, M.2 1, not supported // RF35204 : VRM not supported v.Add(new Voltage("Vcore", 0)); @@ -5419,7 +5465,7 @@ internal sealed class SuperIOHardware : Hardware case Model.X570_MS7C35: // NCT6797D // NCT7802Y (on SMBus): SYS_FAN5, CPU 1.8V, Chipset SOC, Chipset CLDO - not supported - // Unknown: PCIE 1, PCIE 3, M.2_1 + // Unknown: PCIe 1, PCIe 3, M.2_1 v.Add(new Voltage("Vcore", 0)); // CPUVCORE v.Add(new Voltage("+5V", 1, 12, 3)); // VIN1