From 2c8ee5e7d0ced1e66b9e1c9ea67d06732b1777b5 Mon Sep 17 00:00:00 2001 From: Phyxion <> Date: Fri, 31 Jan 2020 13:51:57 +0100 Subject: [PATCH] Update motherboard and chips Add X570 Aorus Master @moellerm. Update chip names. Unify more sensor names. --- LibreHardwareMonitor/UI/MainForm.cs | 2 +- .../Hardware/Motherboard/Identification.cs | 2 + .../Hardware/Motherboard/Lpc/Chip.cs | 9 +- .../Hardware/Motherboard/Lpc/IT87XX.cs | 74 +++-- .../Hardware/Motherboard/Lpc/LPcPort.cs | 9 +- .../Hardware/Motherboard/Lpc/LpcIO.cs | 6 +- .../Hardware/Motherboard/Lpc/Nct677X.cs | 4 +- .../Hardware/Motherboard/Model.cs | 1 + .../Hardware/Motherboard/SuperIOHardware.cs | 259 +++++++++++++----- 9 files changed, 251 insertions(+), 115 deletions(-) diff --git a/LibreHardwareMonitor/UI/MainForm.cs b/LibreHardwareMonitor/UI/MainForm.cs index 6fc95b4..98d1022 100644 --- a/LibreHardwareMonitor/UI/MainForm.cs +++ b/LibreHardwareMonitor/UI/MainForm.cs @@ -487,7 +487,7 @@ namespace LibreHardwareMonitor.UI private void InsertSorted(IList nodes, HardwareNode node) { int i = 0; - while (i < nodes.Count && nodes[i] is HardwareNode && ((HardwareNode)nodes[i]).Hardware.HardwareType < node.Hardware.HardwareType) + while (i < nodes.Count && nodes[i] is HardwareNode && ((HardwareNode)nodes[i]).Hardware.HardwareType <= node.Hardware.HardwareType) i++; nodes.Insert(i, node); diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs index 8647657..95a61b1 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs @@ -252,6 +252,8 @@ namespace LibreHardwareMonitor.Hardware.Motherboard return Model.B350_Gaming_Plus; case var _ when name.Equals("X470 AORUS GAMING 7 WIFI-CF", StringComparison.OrdinalIgnoreCase): return Model.X470_AORUS_GAMING_7_WIFI; + case var _ when name.Equals("X570 AORUS MASTER", StringComparison.OrdinalIgnoreCase): + return Model.X570_AORUS_MASTER; case var _ when name.Equals("Base Board Product Name", StringComparison.OrdinalIgnoreCase): case var _ when name.Equals("To be filled by O.E.M.", StringComparison.OrdinalIgnoreCase): return Model.Unknown; diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Chip.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Chip.cs index 1d0d096..8530764 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Chip.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Chip.cs @@ -40,11 +40,11 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc IT8728F = 0x8728, IT8771E = 0x8771, IT8772E = 0x8772, - IT8792E = 0x8733, + IT879XE = 0x8733, NCT6771F = 0xB470, NCT6776F = 0xC330, - NCT610X = 0xC452, + NCT610XD = 0xC452, NCT6779D = 0xC560, NCT6791D = 0xC803, NCT6792D = 0xC911, @@ -99,10 +99,9 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc case Chip.IT8728F: return "ITE IT8728F"; case Chip.IT8771E: return "ITE IT8771E"; case Chip.IT8772E: return "ITE IT8772E"; - case Chip.IT8792E: return "ITE IT8792E"; - - case Chip.NCT610X: return "Nuvoton NCT610X"; + case Chip.IT879XE: return "ITE IT8792E/IT8795E"; + case Chip.NCT610XD: return "Nuvoton NCT6102D/NCT6104D/NCT6106D"; case Chip.NCT6771F: return "Nuvoton NCT6771F"; case Chip.NCT6776F: return "Nuvoton NCT6776F"; case Chip.NCT6779D: return "Nuvoton NCT6779D"; diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/IT87XX.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/IT87XX.cs index 90e51fe..c6e80a4 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/IT87XX.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/IT87XX.cs @@ -61,64 +61,74 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc Voltages = new float?[10]; Temperatures = new float?[5]; Fans = new float?[5]; - _fansDisabled = new bool[5]; Controls = new float?[3]; + + _fansDisabled = new bool[5]; } else if (chip == Chip.IT8665E) { Voltages = new float?[10]; Temperatures = new float?[6]; Fans = new float?[6]; - _fansDisabled = new bool[6]; Controls = new float?[3]; + + _fansDisabled = new bool[6]; } else if (chip == Chip.IT8688E) { Voltages = new float?[11]; Temperatures = new float?[6]; Fans = new float?[5]; - _fansDisabled = new bool[5]; Controls = new float?[3]; + + _fansDisabled = new bool[5]; } - else if (chip == Chip.IT8792E) + else if (chip == Chip.IT879XE) { - Voltages = new float?[8]; + Voltages = new float?[9]; Temperatures = new float?[3]; Fans = new float?[3]; - _fansDisabled = new bool[3]; Controls = new float?[3]; + + _fansDisabled = new bool[3]; } else { Voltages = new float?[9]; Temperatures = new float?[3]; Fans = new float?[chip == Chip.IT8705F ? 3 : 5]; - _fansDisabled = new bool[chip == Chip.IT8705F ? 3 : 5]; Controls = new float?[3]; + + _fansDisabled = new bool[chip == Chip.IT8705F ? 3 : 5]; } - // IT8620E, IT8628E, IT8721F, IT8728F, IT8772E and IT8686E use a 12mV resolution - // ADC, all others 16mV - if (chip == Chip.IT8620E || - chip == Chip.IT8628E || - chip == Chip.IT8721F || - chip == Chip.IT8728F || - chip == Chip.IT8771E || - chip == Chip.IT8772E || - chip == Chip.IT8686E || - chip == Chip.IT8688E || - chip == Chip.IT8792E - ) + switch (chip) { - _voltageGain = 0.012f; - } - else if (chip == Chip.IT8665E) - { - _voltageGain = 0.0109f; - } - else - { - _voltageGain = 0.016f; + // IT8620E, IT8628E, IT8721F, IT8728F, IT8772E and IT8686E use a 12mV resolution + // ADC, all others 16mV + case Chip.IT8620E: + case Chip.IT8628E: + case Chip.IT8721F: + case Chip.IT8728F: + case Chip.IT8771E: + case Chip.IT8772E: + case Chip.IT8686E: + case Chip.IT8688E: + { + _voltageGain = 0.012f; + break; + } + case Chip.IT8665E: + case Chip.IT879XE: + { + _voltageGain = 0.0109f; + break; + } + default: + { + _voltageGain = 0.016f; + break; + } } // older IT8705F and IT8721F revisions do not have 16-bit fan counters @@ -132,7 +142,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc _has16BitFanCounter = true; } - if (chip == Chip.IT8620E || chip == Chip.IT8792E) + if (chip == Chip.IT8620E || chip == Chip.IT879XE) { _hasNewerAutoPwm = true; } @@ -165,12 +175,16 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc case Chip.IT8716F: case Chip.IT8718F: case Chip.IT8726F: + { _gpioCount = 5; break; + } case Chip.IT8720F: case Chip.IT8721F: + { _gpioCount = 8; break; + } case Chip.IT8620E: case Chip.IT8628E: case Chip.IT8688E: @@ -178,8 +192,10 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc case Chip.IT8728F: case Chip.IT8771E: case Chip.IT8772E: + { _gpioCount = 0; break; + } } } diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LPcPort.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LPcPort.cs index 09d6bf9..8b69d80 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LPcPort.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LPcPort.cs @@ -68,14 +68,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc Ring0.WriteIoPort(RegisterPort, 0x87); Ring0.WriteIoPort(RegisterPort, 0x01); Ring0.WriteIoPort(RegisterPort, 0x55); - if (RegisterPort == 0x4E) - { - Ring0.WriteIoPort(RegisterPort, 0xAA); - } - else - { - Ring0.WriteIoPort(RegisterPort, 0x55); - } + Ring0.WriteIoPort(RegisterPort, RegisterPort == 0x4E ? (byte)0xAA : (byte)0x55); } public void IT87Exit() diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs index 15089a0..b4c4bb6 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/LpcIO.cs @@ -301,7 +301,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc switch (revision & 0xF0) { case 0x50: - chip = Chip.NCT610X; + chip = Chip.NCT610XD; logicalDeviceNumber = WINBOND_NUVOTON_HARDWARE_MONITOR_LDN; break; } @@ -447,7 +447,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc _superIOs.Add(new W836XX(chip, revision, address)); break; } - case Chip.NCT610X: + case Chip.NCT610XD: case Chip.NCT6771F: case Chip.NCT6776F: case Chip.NCT6779D: @@ -557,7 +557,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc chip = Chip.IT8772E; break; case 0x8733: - chip = Chip.IT8792E; + chip = Chip.IT879XE; break; default: chip = Chip.Unknown; diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Nct677X.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Nct677X.cs index a80eb14..7867d1b 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Nct677X.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Lpc/Nct677X.cs @@ -39,7 +39,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc _port = port; _lpcPort = lpcPort; - if (chip == Chip.NCT610X) + if (chip == Chip.NCT610XD) { VENDOR_ID_HIGH_REGISTER = 0x80FE; VENDOR_ID_LOW_REGISTER = 0x00FE; @@ -182,7 +182,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard.Lpc _alternateTemperatureRegister = new ushort?[] { null, 0x491, 0x490, 0x492, 0x493, 0x494, 0x495 }; break; } - case Chip.NCT610X: + case Chip.NCT610XD: { Fans = new float?[3]; Controls = new float?[3]; diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs index f7deb45..acbbbf5 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs @@ -115,6 +115,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard Z68X_UD3H_B3, Z68X_UD7_B3, X470_AORUS_GAMING_7_WIFI, + X570_AORUS_MASTER, // Shuttle FH67, diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs index 3215232..e1f1835 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs @@ -111,11 +111,13 @@ namespace LibreHardwareMonitor.Hardware.Motherboard case ControlMode.Default: { superIO.SetControl(index, null); + break; } case ControlMode.Software: { superIO.SetControl(index, (byte)(control.SoftwareValue * 2.55)); + break; } } @@ -222,9 +224,10 @@ namespace LibreHardwareMonitor.Hardware.Motherboard case Chip.IT8726F: case Chip.IT8665E: case Chip.IT8686E: - case Chip.IT8792E: + case Chip.IT879XE: { GetIteConfigurationsA(superIO, manufacturer, model, v, t, f, c, ref readFan, ref postUpdate, ref mutex); + break; } case Chip.IT8620E: @@ -235,6 +238,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard case Chip.IT8772E: { GetIteConfigurationsB(superIO, manufacturer, model, v, t, f, c); + break; } case Chip.F71858: @@ -242,6 +246,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("VCC3V", 0, 150, 150)); v.Add(new Voltage("VSB3V", 1, 150, 150)); v.Add(new Voltage("Battery", 2, 150, 150)); + for (int i = 0; i < superIO.Temperatures.Length; i++) t.Add(new Temperature("Temperature #" + (i + 1), i)); @@ -260,11 +265,13 @@ namespace LibreHardwareMonitor.Hardware.Motherboard case Chip.F71808E: { GetFintekConfiguration(superIO, manufacturer, model, v, t, f, c); + break; } case Chip.W83627EHF: { GetWinbondConfigurationEhf(manufacturer, model, v, t, f); + break; } case Chip.W83627DHG: @@ -273,6 +280,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard case Chip.W83667HGB: { GetWinbondConfigurationHg(manufacturer, model, v, t, f); + break; } case Chip.W83627HF: @@ -292,15 +300,17 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("System Fan", 0)); f.Add(new Fan("CPU Fan", 1)); f.Add(new Fan("Auxiliary Fan", 2)); + break; } case Chip.NCT6771F: case Chip.NCT6776F: { GetNuvotonConfigurationF(superIO, manufacturer, model, v, t, f, c); + break; } - case Chip.NCT610X: + case Chip.NCT610XD: { v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("Voltage #0", 1, true)); @@ -315,6 +325,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard t.Add(new Temperature("SYS", 1)); t.Add(new Temperature("CPU Core", 2)); t.Add(new Temperature("AUX", 3)); + for (int i = 0; i < superIO.Fans.Length; i++) f.Add(new Fan("Fan #" + (i + 1), i)); @@ -334,17 +345,19 @@ namespace LibreHardwareMonitor.Hardware.Motherboard case Chip.NCT6798D: { GetNuvotonConfigurationD(superIO, manufacturer, model, v, t, f, c); + break; } default: { GetDefaultConfiguration(superIO, v, t, f, c); + break; } } } - private static void GetDefaultConfiguration(ISuperIO superIO, IList v, IList t, IList f, IList c) + private static void GetDefaultConfiguration(ISuperIO superIO, ICollection v, ICollection t, ICollection f, ICollection c) { for (int i = 0; i < superIO.Voltages.Length; i++) v.Add(new Voltage("Voltage #" + (i + 1), i, true)); @@ -382,6 +395,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard { v.Add(new Voltage("VBat", 8)); t.Add(new Temperature("CPU", 0)); + for (int i = 0; i < superIO.Fans.Length; i++) f.Add(new Fan("Fan #" + (i + 1), i)); @@ -400,6 +414,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("CPU Fan", 0)); f.Add(new Fan("Chassis Fan #1", 1)); f.Add(new Fan("Power Fan", 2)); + break; } case Model.M4A79XTD_EVO: // IT8720F @@ -411,6 +426,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("CPU Fan", 0)); f.Add(new Fan("Chassis Fan #1", 1)); f.Add(new Fan("Chassis Fan #2", 2)); + break; } case Model.PRIME_X370_PRO: // IT8665E @@ -429,10 +445,12 @@ namespace LibreHardwareMonitor.Hardware.Motherboard t.Add(new Temperature("CPU", 0)); t.Add(new Temperature("Motherboard", 1)); t.Add(new Temperature("PCH", 2)); + for (int i = 3; i < superIO.Temperatures.Length; i++) t.Add(new Temperature("Temperature #" + (i + 1), i)); f.Add(new Fan("CPU Fan", 0)); + for (int i = 1; i < superIO.Fans.Length; i++) f.Add(new Fan("Fan #" + (i + 1), i)); @@ -449,7 +467,6 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("1.8V PLL", 6, 10, 10)); v.Add(new Voltage("+3.3V", 7, 10, 10)); v.Add(new Voltage("VBat", 8, 10, 10)); - t.Add(new Temperature("CPU", 0)); t.Add(new Temperature("Motherboard", 1)); t.Add(new Temperature("CPU Socket", 2)); @@ -458,8 +475,8 @@ namespace LibreHardwareMonitor.Hardware.Motherboard t.Add(new Temperature("VRM", 5)); f.Add(new Fan("CPU Fan", 0)); - f.Add(new Fan("Chassis Fan 1", 1)); - f.Add(new Fan("Chassis Fan 2", 2)); + f.Add(new Fan("Chassis Fan #1", 1)); + f.Add(new Fan("Chassis Fan #2", 2)); f.Add(new Fan("High Amp Fan", 3)); f.Add(new Fan("Fan 5", 4)); f.Add(new Fan("Fan 6", 5)); @@ -480,6 +497,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Voltage #7", 6, true)); v.Add(new Voltage("Voltage #8", 7, true)); v.Add(new Voltage("VBat", 8)); + for (int i = 0; i < superIO.Temperatures.Length; i++) t.Add(new Temperature("Temperature #" + (i + 1), i)); @@ -522,6 +540,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Voltage #7", 6, true)); v.Add(new Voltage("Voltage #8", 7, true)); v.Add(new Voltage("VBat", 8)); + for (int i = 0; i < superIO.Temperatures.Length; i++) t.Add(new Temperature("Temperature #" + (i + 1), i)); @@ -555,6 +574,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("Fan #1", 0)); f.Add(new Fan("Fan #2", 1)); f.Add(new Fan("Fan #3", 2)); + break; } case Model.LP_DK_P55_T3EH9: // IT8720F @@ -574,6 +594,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("Fan #1", 0)); f.Add(new Fan("Fan #2", 1)); f.Add(new Fan("Fan #3", 2)); + break; } default: @@ -587,6 +608,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("DIMM", 6, true)); v.Add(new Voltage("+5VSB", 7, 6.8f, 10, 0, true)); v.Add(new Voltage("VBat", 8)); + for (int i = 0; i < superIO.Temperatures.Length; i++) t.Add(new Temperature("Temperature #" + (i + 1), i)); @@ -618,6 +640,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard t.Add(new Temperature("CPU", 1)); f.Add(new Fan("CPU Fan", 0)); f.Add(new Fan("System Fan", 1)); + break; } case Model.EP45_DS3R: // IT8718F @@ -636,6 +659,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("System Fan #2", 1)); f.Add(new Fan("Power Fan", 2)); f.Add(new Fan("System Fan #1", 3)); + break; } case Model.EX58_EXTREME: // IT8720F @@ -651,6 +675,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("System Fan #2", 1)); f.Add(new Fan("Power Fan", 2)); f.Add(new Fan("System Fan #1", 3)); + break; } case Model.P35_DS3: // IT8718F @@ -668,6 +693,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("System Fan #1", 1)); f.Add(new Fan("System Fan #2", 2)); f.Add(new Fan("Power Fan", 3)); + break; } case Model.P55_UD4: // IT8720F @@ -688,6 +714,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("System Fan #2", 1)); f.Add(new Fan("Power Fan", 2)); f.Add(new Fan("System Fan #1", 3)); + break; } case Model.H55N_USB3: // IT8720F @@ -702,6 +729,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard t.Add(new Temperature("CPU", 2)); f.Add(new Fan("CPU Fan", 0)); f.Add(new Fan("System Fan", 1)); + break; } case Model.G41M_COMBO: // IT8718F @@ -717,6 +745,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard t.Add(new Temperature("CPU", 2)); f.Add(new Fan("CPU Fan", 0)); f.Add(new Fan("System Fan", 1)); + break; } case Model._970A_UD3: // IT8720F @@ -733,9 +762,10 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("System Fan #1", 1)); f.Add(new Fan("System Fan #2", 2)); f.Add(new Fan("Power Fan", 4)); - c.Add(new Ctrl("PWM 1", 0)); - c.Add(new Ctrl("PWM 2", 1)); - c.Add(new Ctrl("PWM 3", 2)); + c.Add(new Ctrl("PWM #1", 0)); + c.Add(new Ctrl("PWM #2", 1)); + c.Add(new Ctrl("PWM #3", 2)); + break; } case Model.MA770T_UD3: // IT8720F @@ -754,6 +784,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("System Fan #1", 1)); f.Add(new Fan("System Fan #2", 2)); f.Add(new Fan("Power Fan", 3)); + break; } case Model.MA78LM_S2H: // IT8718F @@ -771,6 +802,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("System Fan #1", 1)); f.Add(new Fan("System Fan #2", 2)); f.Add(new Fan("Power Fan", 3)); + break; } case Model.MA785GM_US2H: // IT8718F @@ -787,6 +819,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("CPU Fan", 0)); f.Add(new Fan("System Fan", 1)); f.Add(new Fan("NB Fan", 2)); + break; } case Model.X58A_UD3R: // IT8720F @@ -804,6 +837,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("System Fan #2", 1)); f.Add(new Fan("Power Fan", 2)); f.Add(new Fan("System Fan #1", 3)); + break; } case Model.AX370_Gaming_K7: // IT8686E @@ -824,8 +858,9 @@ namespace LibreHardwareMonitor.Hardware.Motherboard t.Add(new Temperature("System", 0)); t.Add(new Temperature("Chipset", 1)); t.Add(new Temperature("CPU", 2)); - t.Add(new Temperature("PCIEX16", 3)); + t.Add(new Temperature("PCIe x16", 3)); t.Add(new Temperature("VRM MOS", 4)); + for (int i = 0; i < superIO.Fans.Length; i++) f.Add(new Fan("Fan #" + (i + 1), i)); @@ -846,16 +881,17 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("PCHCore", 8)); v.Add(new Voltage("CPU VCCIO", 9)); v.Add(new Voltage("DDRVPP", 10)); - t.Add(new Temperature("System1", 0)); + t.Add(new Temperature("System #1", 0)); t.Add(new Temperature("PCH", 1)); t.Add(new Temperature("CPU", 2)); - t.Add(new Temperature("PCIEX16", 3)); + t.Add(new Temperature("PCIe x16", 3)); t.Add(new Temperature("VRM MOS", 4)); t.Add(new Temperature("System2", 5)); f.Add(new Fan("CPU Fan", 0)); f.Add(new Fan("System Fan #1", 1)); f.Add(new Fan("System Fan #2", 2)); f.Add(new Fan("System Fan #3", 3)); + break; } case Model.X399_AORUS_Gaming_7: //ITE IT8686E @@ -865,16 +901,15 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("+12V", 2, 5, 1)); v.Add(new Voltage("+5V", 3, 1.5F, 1)); v.Add(new Voltage("DIMM CD", 4, 0, 1)); - v.Add(new Voltage("SOC Vcore", 5, 0, 1)); + v.Add(new Voltage("Vcore SoC", 5, 0, 1)); v.Add(new Voltage("DIMM AB", 6, 0, 1)); v.Add(new Voltage("3VSB", 7, 10, 10)); v.Add(new Voltage("VBat", 8, 10, 10)); v.Add(new Voltage("AVCC3", 9, 54, 10)); - - t.Add(new Temperature("System 1", 0)); + t.Add(new Temperature("System #1", 0)); t.Add(new Temperature("Chipset", 1)); t.Add(new Temperature("CPU", 2)); - t.Add(new Temperature("PCIE_X16", 3)); + t.Add(new Temperature("PCIe x16", 3)); t.Add(new Temperature("VRM", 4)); for (int i = 0; i < superIO.Fans.Length; i++) @@ -895,21 +930,21 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("+3.3V", 1, 6.5F, 10)); v.Add(new Voltage("+12V", 2, 5, 1)); v.Add(new Voltage("+5V", 3, 1.5F, 1)); - v.Add(new Voltage("SOC Vcore", 4, 0, 1)); + v.Add(new Voltage("Vcore SoC", 4, 0, 1)); v.Add(new Voltage("VDDP", 5, 0, 1)); v.Add(new Voltage("DIMM AB", 6, 0, 1)); v.Add(new Voltage("3VSB", 7, 10, 10)); v.Add(new Voltage("VBat", 8, 10, 10)); v.Add(new Voltage("AVCC3", 9, 54, 10)); - - t.Add(new Temperature("System 1", 0)); + t.Add(new Temperature("System #1", 0)); t.Add(new Temperature("Chipset", 1)); t.Add(new Temperature("CPU", 2)); - t.Add(new Temperature("PCIE_X16", 3)); + t.Add(new Temperature("PCIe x16", 3)); t.Add(new Temperature("VRM", 4)); + break; } - case Chip.IT8792E: + case Chip.IT879XE: { v.Add(new Voltage("VIN0", 0, 0, 1)); v.Add(new Voltage("DDR VTT", 1, 0, 1)); @@ -919,9 +954,9 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Chipset Core +2.5V", 5, 0.5F, 1)); v.Add(new Voltage("3VSB", 6, 1, 10)); v.Add(new Voltage("VBat", 7, 0.7F, 1)); - - t.Add(new Temperature("PCIE_X8", 0)); - t.Add(new Temperature("System 2", 2)); + t.Add(new Temperature("PCIe x8", 0)); + t.Add(new Temperature("System #2", 2)); + break; } } @@ -934,6 +969,59 @@ namespace LibreHardwareMonitor.Hardware.Motherboard break; } + case Model.X570_AORUS_MASTER: // IT8688E + { + switch (superIO.Chip) + { + case Chip.IT8688E: + { + v.Add(new Voltage("Vcore", 0)); + v.Add(new Voltage("+3.3V", 1, 29.4f, 45.3f)); + v.Add(new Voltage("+12V", 2, 10f, 2f)); + v.Add(new Voltage("+5V", 3, 15f, 10f)); + v.Add(new Voltage("Vcore SoC", 4)); + v.Add(new Voltage("VDDP", 5)); + v.Add(new Voltage("DIMM AB", 6)); + v.Add(new Voltage("3VSB", 7, 1f, 10f)); + v.Add(new Voltage("VBat", 8, 1f, 10f)); + t.Add(new Temperature("System #1", 0)); + t.Add(new Temperature("EC_TEMP1", 1)); + t.Add(new Temperature("CPU", 2)); + t.Add(new Temperature("PCIe x16", 3)); + t.Add(new Temperature("VRM MOS", 4)); + t.Add(new Temperature("PCH", 5)); + f.Add(new Fan("CPU Fan", 0)); + f.Add(new Fan("System Fan #1", 1)); + f.Add(new Fan("System Fan #2", 2)); + f.Add(new Fan("PCH Fan", 3)); + f.Add(new Fan("CPU OPT Fan", 4)); + + break; + } + case Chip.IT879XE: + { + v.Add(new Voltage("CPU VDD18", 0)); + v.Add(new Voltage("DDRVTT AB", 1)); + v.Add(new Voltage("Chipset Core", 2)); + v.Add(new Voltage("Voltage #4", 3, true)); + v.Add(new Voltage("CPU VDD18", 4)); + v.Add(new Voltage("PM_CLDO12", 5)); + v.Add(new Voltage("Voltage #7", 6, true)); + v.Add(new Voltage("3VSB", 7, 1f, 1f)); + v.Add(new Voltage("VBat", 8, 1f, 1f)); + t.Add(new Temperature("PCIe x8", 0)); + t.Add(new Temperature("EC_TEMP2", 1)); + t.Add(new Temperature("System #2", 2)); + f.Add(new Fan("System Fan #5 Pump", 0)); + f.Add(new Fan("System Fan #6 Pump", 1)); + f.Add(new Fan("System Fan #4", 2)); + + break; + } + } + + break; + } default: { v.Add(new Voltage("Vcore", 0)); @@ -945,6 +1033,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Voltage #7", 6, true)); v.Add(new Voltage("Voltage #8", 7, true)); v.Add(new Voltage("VBat", 8)); + for (int i = 0; i < superIO.Temperatures.Length; i++) t.Add(new Temperature("Temperature #" + (i + 1), i)); @@ -971,6 +1060,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Voltage #7", 6, true)); v.Add(new Voltage("Voltage #8", 7, true)); v.Add(new Voltage("VBat", 8)); + for (int i = 0; i < superIO.Temperatures.Length; i++) t.Add(new Temperature("Temperature #" + (i + 1), i)); @@ -1075,7 +1165,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("NB Voltage", 2)); v.Add(new Voltage("Analog +3.3V", 3, 10, 10)); // v.Add(new Voltage("DIMM", 6, true)); - v.Add(new Voltage("Standby +3.3V", 7, 10, 10)); + v.Add(new Voltage("3VSB", 7, 10, 10)); v.Add(new Voltage("VBat", 8, 10, 10)); t.Add(new Temperature("CPU", 0)); t.Add(new Temperature("System", 1)); @@ -1083,6 +1173,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("CPU Fan", 0)); f.Add(new Fan("System Fan", 1)); f.Add(new Fan("Power Fan", 2)); + break; } default: @@ -1094,8 +1185,9 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Voltage #5", 4, true)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("Voltage #7", 6, true)); - v.Add(new Voltage("Standby +3.3V", 7, 10, 10, 0, true)); + v.Add(new Voltage("3VSB", 7, 10, 10, 0, true)); v.Add(new Voltage("VBat", 8, 10, 10)); + for (int i = 0; i < superIO.Temperatures.Length; i++) t.Add(new Temperature("Temperature #" + (i + 1), i)); @@ -1122,12 +1214,13 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("+12V", 2, 30.9f, 10)); v.Add(new Voltage("Vcore", 5)); v.Add(new Voltage("DIMM", 6)); - v.Add(new Voltage("Standby +3.3V", 7, 10, 10)); + v.Add(new Voltage("3VSB", 7, 10, 10)); v.Add(new Voltage("VBat", 8, 10, 10)); t.Add(new Temperature("System", 0)); t.Add(new Temperature("CPU", 2)); f.Add(new Fan("CPU Fan", 0)); f.Add(new Fan("System Fan", 1)); + break; } case Model.H67A_UD3H_B3: // IT8728F @@ -1138,7 +1231,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("+12V", 2, 30.9f, 10)); v.Add(new Voltage("Vcore", 5)); v.Add(new Voltage("DIMM", 6)); - v.Add(new Voltage("Standby +3.3V", 7, 10, 10)); + v.Add(new Voltage("3VSB", 7, 10, 10)); v.Add(new Voltage("VBat", 8, 10, 10)); t.Add(new Temperature("System", 0)); t.Add(new Temperature("CPU", 2)); @@ -1146,6 +1239,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("System Fan #1", 1)); f.Add(new Fan("Power Fan", 2)); f.Add(new Fan("System Fan #2", 3)); + break; } case Model.Z68A_D3H_B3: // IT8728F @@ -1156,7 +1250,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("+5V", 3, 7.15f, 10)); v.Add(new Voltage("Vcore", 5)); v.Add(new Voltage("DIMM", 6)); - v.Add(new Voltage("Standby +3.3V", 7, 10, 10)); + v.Add(new Voltage("3VSB", 7, 10, 10)); v.Add(new Voltage("VBat", 8, 10, 10)); t.Add(new Temperature("System", 0)); t.Add(new Temperature("CPU", 2)); @@ -1164,6 +1258,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("System Fan #1", 1)); f.Add(new Fan("Power Fan", 2)); f.Add(new Fan("System Fan #2", 3)); + break; } case Model.P67A_UD3_B3: // IT8728F @@ -1178,7 +1273,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("+5V", 3, 7.15f, 10)); v.Add(new Voltage("Vcore", 5)); v.Add(new Voltage("DIMM", 6)); - v.Add(new Voltage("Standby +3.3V", 7, 10, 10)); + v.Add(new Voltage("3VSB", 7, 10, 10)); v.Add(new Voltage("VBat", 8, 10, 10)); t.Add(new Temperature("System", 0)); t.Add(new Temperature("CPU", 2)); @@ -1186,6 +1281,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("System Fan #2", 1)); f.Add(new Fan("Power Fan", 2)); f.Add(new Fan("System Fan #1", 3)); + break; } case Model.Z68X_UD7_B3: // IT8728F @@ -1196,27 +1292,28 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("+5V", 3, 7.15f, 10)); v.Add(new Voltage("Vcore", 5)); v.Add(new Voltage("DIMM", 6)); - v.Add(new Voltage("Standby +3.3V", 7, 10, 10)); + v.Add(new Voltage("3VSB", 7, 10, 10)); v.Add(new Voltage("VBat", 8, 10, 10)); t.Add(new Temperature("System", 0)); t.Add(new Temperature("CPU", 1)); - t.Add(new Temperature("System 3", 2)); + t.Add(new Temperature("System #3", 2)); f.Add(new Fan("CPU Fan", 0)); f.Add(new Fan("Power 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)); + break; } case Model.X79_UD3: // IT8728F { v.Add(new Voltage("VTT", 0)); - v.Add(new Voltage("DIMM CH A/B", 1)); + v.Add(new Voltage("DIMM AB", 1)); v.Add(new Voltage("+12V", 2, 10, 2)); v.Add(new Voltage("+5V", 3, 15, 10)); v.Add(new Voltage("VIN4", 4)); v.Add(new Voltage("VCore", 5)); - v.Add(new Voltage("DIMM CH C/D", 6)); + v.Add(new Voltage("DIMM CD", 6)); v.Add(new Voltage("+3V Standby", 7, 1, 1)); v.Add(new Voltage("VBat", 8, 1, 1)); t.Add(new Temperature("System", 0)); @@ -1226,6 +1323,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("System Fan #1", 1)); f.Add(new Fan("System Fan #2", 2)); f.Add(new Fan("System Fan #3", 3)); + break; } default: @@ -1237,8 +1335,9 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Voltage #5", 4, true)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("Voltage #7", 6, true)); - v.Add(new Voltage("Standby +3.3V", 7, 10, 10, 0, true)); + v.Add(new Voltage("3VSB", 7, 10, 10, 0, true)); v.Add(new Voltage("VBat", 8, 10, 10)); + for (int i = 0; i < superIO.Temperatures.Length; i++) t.Add(new Temperature("Temperature #" + (i + 1), i)); @@ -1265,12 +1364,13 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("PCH VCCIO", 2)); v.Add(new Voltage("CPU VCCIO", 3)); v.Add(new Voltage("Graphic Voltage", 4)); - v.Add(new Voltage("Standby +3.3V", 7, 10, 10)); + v.Add(new Voltage("3VSB", 7, 10, 10)); v.Add(new Voltage("VBat", 8, 10, 10)); t.Add(new Temperature("System", 0)); t.Add(new Temperature("CPU", 1)); f.Add(new Fan("Fan #1", 0)); f.Add(new Fan("CPU Fan", 1)); + break; } default: @@ -1282,8 +1382,9 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Voltage #5", 4, true)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("Voltage #7", 6, true)); - v.Add(new Voltage("Standby +3.3V", 7, 10, 10, 0, true)); + v.Add(new Voltage("3VSB", 7, 10, 10, 0, true)); v.Add(new Voltage("VBat", 8, 10, 10)); + for (int i = 0; i < superIO.Temperatures.Length; i++) t.Add(new Temperature("Temperature #" + (i + 1), i)); @@ -1308,8 +1409,9 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Voltage #5", 4, true)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("Voltage #7", 6, true)); - v.Add(new Voltage("Standby +3.3V", 7, 10, 10, 0, true)); + v.Add(new Voltage("3VSB", 7, 10, 10, 0, true)); v.Add(new Voltage("VBat", 8, 10, 10)); + for (int i = 0; i < superIO.Temperatures.Length; i++) t.Add(new Temperature("Temperature #" + (i + 1), i)); @@ -1349,6 +1451,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("CPU Fan", 0)); f.Add(new Fan("Power Fan", 1)); f.Add(new Fan("Chassis Fan", 2)); + break; } default: @@ -1362,6 +1465,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Voltage #7", 6, true)); v.Add(new Voltage("VSB3V", 7, 150, 150)); v.Add(new Voltage("VBat", 8, 150, 150)); + for (int i = 0; i < superIO.Temperatures.Length; i++) t.Add(new Temperature("Temperature #" + (i + 1), i)); @@ -1387,6 +1491,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("VSB3V", 7, 150, 150)); v.Add(new Voltage("VBat", 8, 150, 150)); + for (int i = 0; i < superIO.Temperatures.Length; i++) t.Add(new Temperature("Temperature #" + (i + 1), i)); @@ -1418,7 +1523,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Analog +3.3V", 2, 34, 34)); v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("+5V", 4, 12, 3)); - v.Add(new Voltage("Standby +3.3V", 7, 34, 34)); + v.Add(new Voltage("3VSB", 7, 34, 34)); v.Add(new Voltage("VBat", 8, 34, 34)); t.Add(new Temperature("CPU", 0)); t.Add(new Temperature("Auxiliary", 2)); @@ -1430,6 +1535,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard c.Add(new Ctrl("Chassis Fan #2", 0)); c.Add(new Ctrl("CPU Fan", 1)); c.Add(new Ctrl("Chassis Fan #1", 2)); + break; } case Model.P8P67_M_PRO: // NCT6776F @@ -1441,7 +1547,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("+5V", 4, 12, 3)); v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("Voltage #7", 6, true)); - v.Add(new Voltage("Standby +3.3V", 7, 34, 34)); + v.Add(new Voltage("3VSB", 7, 34, 34)); v.Add(new Voltage("VBat", 8, 34, 34)); t.Add(new Temperature("CPU", 0)); t.Add(new Temperature("Motherboard", 3)); @@ -1450,6 +1556,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("Chassis Fan #2", 2)); f.Add(new Fan("Power Fan", 3)); f.Add(new Fan("Auxiliary Fan", 4)); + break; } case Model.P8Z68_V_PRO: // NCT6776F @@ -1459,11 +1566,12 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Analog +3.3V", 2, 34, 34)); v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("+5V", 4, 12, 3)); - v.Add(new Voltage("Standby +3.3V", 7, 34, 34)); + v.Add(new Voltage("3VSB", 7, 34, 34)); v.Add(new Voltage("VBat", 8, 34, 34)); t.Add(new Temperature("CPU", 0)); t.Add(new Temperature("Auxiliary", 2)); t.Add(new Temperature("Motherboard", 3)); + for (int i = 0; i < superIO.Fans.Length; i++) f.Add(new Fan("Fan #" + (i + 1), i)); @@ -1479,10 +1587,11 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Analog +3.3V", 2, 34, 34)); v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("+5V", 4, 12, 3)); - v.Add(new Voltage("Standby +3.3V", 7, 34, 34)); + v.Add(new Voltage("3VSB", 7, 34, 34)); v.Add(new Voltage("VBat", 8, 34, 34)); t.Add(new Temperature("CPU", 0)); t.Add(new Temperature("Motherboard", 3)); + for (int i = 0; i < superIO.Fans.Length; i++) f.Add(new Fan("Fan #" + (i + 1), i)); @@ -1506,6 +1615,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard t.Add(new Temperature("Temperature #1", 1)); t.Add(new Temperature("Temperature #2", 2)); t.Add(new Temperature("Temperature #3", 3)); + for (int i = 0; i < superIO.Fans.Length; i++) f.Add(new Fan("Fan #" + (i + 1), i)); @@ -1531,7 +1641,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("VIN1", 4, true)); v.Add(new Voltage("+5V", 5, 12, 3)); v.Add(new Voltage("VIN3", 6, true)); - v.Add(new Voltage("Standby +3.3V", 7, 34, 34)); + v.Add(new Voltage("3VSB", 7, 34, 34)); t.Add(new Temperature("CPU", 0)); t.Add(new Temperature("Auxiliary", 2)); t.Add(new Temperature("Motherboard", 3)); @@ -1551,12 +1661,11 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("+12V", 1, 56, 10)); v.Add(new Voltage("AVCC", 2, 10, 10)); v.Add(new Voltage("3VCC", 3, 10, 10)); - //v.Add(new Voltage("#Unused 4", 4, 0, 1, 0, true)); + //v.Add(new Voltage("#Unused #4", 4, 0, 1, 0, true)); v.Add(new Voltage("+5V", 5, 20, 10)); - //v.Add(new Voltage("#Unused 6", 6, 0, 1, 0, true)); + //v.Add(new Voltage("#Unused #6", 6, 0, 1, 0, true)); v.Add(new Voltage("3VSB", 7, 10, 10)); v.Add(new Voltage("VBat", 8, 10, 10)); - t.Add(new Temperature("CPU Core", 0)); t.Add(new Temperature("CPU", 1)); t.Add(new Temperature("AUX", 2)); @@ -1585,6 +1694,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard t.Add(new Temperature("Temperature #1", 1)); t.Add(new Temperature("Temperature #2", 2)); t.Add(new Temperature("Temperature #3", 3)); + for (int i = 0; i < superIO.Fans.Length; i++) f.Add(new Fan("Fan #" + (i + 1), i)); @@ -1612,6 +1722,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard t.Add(new Temperature("Temperature #1", 1)); t.Add(new Temperature("Temperature #2", 2)); t.Add(new Temperature("Temperature #3", 3)); + for (int i = 0; i < superIO.Fans.Length; i++) f.Add(new Fan("Fan #" + (i + 1), i)); @@ -1642,18 +1753,18 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("DIMM", 6, 0, 1)); v.Add(new Voltage("3VSB", 7, 10, 10)); v.Add(new Voltage("VBat", 8, 10, 10)); - //v.Add(new Voltage("#Unused 9", 9, 0, 1, 0, true)); - //v.Add(new Voltage("#Unused 10", 10, 0, 1, 0, true)); - //v.Add(new Voltage("#Unused 11", 11, 34, 34, 0, true)); + //v.Add(new Voltage("#Unused #9", 9, 0, 1, 0, true)); + //v.Add(new Voltage("#Unused #10", 10, 0, 1, 0, true)); + //v.Add(new Voltage("#Unused #11", 11, 34, 34, 0, true)); v.Add(new Voltage("+5V", 12, 20, 10)); - //v.Add(new Voltage("#Unused 13", 13, 10, 10, 0, true)); - //v.Add(new Voltage("#Unused 14", 14, 0, 1, 0, true)); + //v.Add(new Voltage("#Unused #13", 13, 10, 10, 0, true)); + //v.Add(new Voltage("#Unused #14", 14, 0, 1, 0, true)); - //t.Add(new Temperature("#Unused 0", 0)); - //t.Add(new Temperature("#Unused 1", 1)); + //t.Add(new Temperature("#Unused #0", 0)); + //t.Add(new Temperature("#Unused #1", 1)); t.Add(new Temperature("Motherboard", 2)); - //t.Add(new Temperature("#Unused 3", 3)); - //t.Add(new Temperature("#Unused 4", 4)); + //t.Add(new Temperature("#Unused #3", 3)); + //t.Add(new Temperature("#Unused #4", 4)); t.Add(new Temperature("AUX", 5)); for (int i = 0; i < superIO.Fans.Length; i++) @@ -1681,16 +1792,15 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("3VCC", 3, 10, 10)); v.Add(new Voltage("+12V", 4, 28, 5)); v.Add(new Voltage("Vcore Refin", 5, 0, 1)); - //v.Add(new Voltage("#Unused 6", 6, 0, 1, 0, true)); + //v.Add(new Voltage("#Unused #6", 6, 0, 1, 0, true)); v.Add(new Voltage("3VSB", 7, 10, 10)); v.Add(new Voltage("VBat", 8, 34, 34)); - //v.Add(new Voltage("#Unused 9", 9, 0, 1, 0, true)); - //v.Add(new Voltage("#Unused 10", 10, 0, 1, 0, true)); + //v.Add(new Voltage("#Unused #9", 9, 0, 1, 0, true)); + //v.Add(new Voltage("#Unused #10", 10, 0, 1, 0, true)); v.Add(new Voltage("Chipset 1.05V", 11, 0, 1)); v.Add(new Voltage("+5V", 12, 20, 10)); - //v.Add(new Voltage("#Unused 13", 13, 0, 1, 0, true)); + //v.Add(new Voltage("#Unused #13", 13, 0, 1, 0, true)); v.Add(new Voltage("+1.8V", 14, 0, 1)); - t.Add(new Temperature("CPU Core", 0)); t.Add(new Temperature("CPU", 1)); t.Add(new Temperature("Motherboard", 2)); @@ -1725,7 +1835,6 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("+5V", 12, 20, 10)); v.Add(new Voltage("+1.8V", 13, 10, 10)); //v.Add(new Voltage("unused", 14, 34, 34, 0, true)); - t.Add(new Temperature("CPU Core", 0)); t.Add(new Temperature("Motherboard", 1)); t.Add(new Temperature("AUX", 2)); @@ -1741,7 +1850,6 @@ namespace LibreHardwareMonitor.Hardware.Motherboard break; } - default: { v.Add(new Voltage("Vcore", 0, 10, 10)); @@ -1766,6 +1874,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard t.Add(new Temperature("Temperature #4", 4)); t.Add(new Temperature("Temperature #5", 5)); t.Add(new Temperature("Temperature #6", 6)); + for (int i = 0; i < superIO.Fans.Length; i++) f.Add(new Fan("Fan #" + (i + 1), i)); @@ -1810,6 +1919,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard c.Add(new Ctrl("CPU Fan", 1)); c.Add(new Ctrl("Chassis Fan #2", 2)); c.Add(new Ctrl("Chassis Fan #3", 3)); + break; } case Model.ROG_MAXIMUS_X_APEX: // NCT6793D @@ -1846,6 +1956,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard c.Add(new Ctrl("Chassis Fan #2", 2)); c.Add(new Ctrl("Chassis Fan #3", 3)); c.Add(new Ctrl("AIO Pump", 4)); + break; } case Model.Z170_A: //NCT6793D @@ -1865,7 +1976,6 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("PCH Core", 12)); v.Add(new Voltage("CPU PLLs", 13)); v.Add(new Voltage("CPU VCCIO/IMC", 14)); - t.Add(new Temperature("CPU (PECI)", 0)); t.Add(new Temperature("CPU", 1)); t.Add(new Temperature("Motherboard", 2)); @@ -1906,6 +2016,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard t.Add(new Temperature("Temperature #4", 4)); t.Add(new Temperature("Temperature #5", 5)); t.Add(new Temperature("Temperature #6", 6)); + for (int i = 0; i < superIO.Fans.Length; i++) f.Add(new Fan("Fan #" + (i + 1), i)); @@ -1948,6 +2059,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard c.Add(new Ctrl("CPU Fan", 1)); c.Add(new Ctrl("System Fan #1", 2)); c.Add(new Ctrl("System Fan #2", 3)); + break; } case Model.B450A_PRO: // NCT6797D @@ -1983,6 +2095,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard c.Add(new Ctrl("System Fan #2", 3)); c.Add(new Ctrl("System Fan #3", 4)); c.Add(new Ctrl("System Fan #4", 5)); + break; } case Model.Z270_PC_MATE: // NCT6795D @@ -2016,6 +2129,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard c.Add(new Ctrl("System Fan #2", 3)); c.Add(new Ctrl("System Fan #3", 4)); c.Add(new Ctrl("System Fan #4", 5)); + break; } default: @@ -2042,6 +2156,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard t.Add(new Temperature("Temperature #4", 4)); t.Add(new Temperature("Temperature #5", 5)); t.Add(new Temperature("Temperature #6", 6)); + for (int i = 0; i < superIO.Fans.Length; i++) f.Add(new Fan("Fan #" + (i + 1), i)); @@ -2078,6 +2193,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard t.Add(new Temperature("Temperature #4", 4)); t.Add(new Temperature("Temperature #5", 5)); t.Add(new Temperature("Temperature #6", 6)); + for (int i = 0; i < superIO.Fans.Length; i++) f.Add(new Fan("Fan #" + (i + 1), i)); @@ -2104,12 +2220,13 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("+3.3V", 4, 10, 10)); v.Add(new Voltage("+5V", 5, 20, 10)); v.Add(new Voltage("+12V", 6, 28, 5)); - v.Add(new Voltage("Standby +3.3V", 7, 34, 34)); + v.Add(new Voltage("3VSB", 7, 34, 34)); v.Add(new Voltage("VBat", 8, 34, 34)); t.Add(new Temperature("CPU", 0)); t.Add(new Temperature("Motherboard", 2)); f.Add(new Fan("CPU Fan", 0)); f.Add(new Fan("Chassis Fan", 1)); + break; } default: @@ -2132,6 +2249,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("Auxiliary Fan", 2)); f.Add(new Fan("CPU Fan #2", 3)); f.Add(new Fan("Auxiliary Fan #2", 4)); + break; } } @@ -2158,6 +2276,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("Auxiliary Fan", 2)); f.Add(new Fan("CPU Fan #2", 3)); f.Add(new Fan("Auxiliary Fan #2", 4)); + break; } } @@ -2177,13 +2296,14 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("+5V", 5, 15, 7.5f)); v.Add(new Voltage("+12V", 6, 56, 10)); - v.Add(new Voltage("Standby +3.3V", 7, 34, 34)); + v.Add(new Voltage("3VSB", 7, 34, 34)); v.Add(new Voltage("VBat", 8, 34, 34)); t.Add(new Temperature("CPU", 0)); t.Add(new Temperature("Motherboard", 2)); f.Add(new Fan("Chassis Fan", 0)); f.Add(new Fan("CPU Fan", 1)); f.Add(new Fan("Power Fan", 2)); + break; } default: @@ -2205,6 +2325,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("Auxiliary Fan", 2)); f.Add(new Fan("CPU Fan #2", 3)); f.Add(new Fan("Auxiliary Fan #2", 4)); + break; } } @@ -2224,7 +2345,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Analog +3.3V", 2, 34, 34)); v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("+5V", 4, 15, 7.5f)); - v.Add(new Voltage("Standby +3.3V", 7, 34, 34)); + v.Add(new Voltage("3VSB", 7, 34, 34)); v.Add(new Voltage("VBat", 8, 34, 34)); t.Add(new Temperature("CPU", 0)); t.Add(new Temperature("Motherboard", 2)); @@ -2233,6 +2354,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("Power Fan", 2)); f.Add(new Fan("Chassis Fan #2", 3)); f.Add(new Fan("Chassis Fan #3", 4)); + break; } case Model.RAMPAGE_EXTREME: // W83667HG @@ -2242,7 +2364,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard v.Add(new Voltage("Analog +3.3V", 2, 34, 34)); v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("+5V", 4, 15, 7.5f)); - v.Add(new Voltage("Standby +3.3V", 7, 34, 34)); + v.Add(new Voltage("3VSB", 7, 34, 34)); v.Add(new Voltage("VBat", 8, 34, 34)); t.Add(new Temperature("CPU", 0)); t.Add(new Temperature("Motherboard", 2)); @@ -2251,6 +2373,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("Power Fan", 2)); f.Add(new Fan("Chassis Fan #2", 3)); f.Add(new Fan("Chassis Fan #3", 4)); + break; } default: @@ -2272,6 +2395,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("Auxiliary Fan", 2)); f.Add(new Fan("CPU Fan #2", 3)); f.Add(new Fan("Auxiliary Fan #2", 4)); + break; } } @@ -2297,6 +2421,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard f.Add(new Fan("Auxiliary Fan", 2)); f.Add(new Fan("CPU Fan #2", 3)); f.Add(new Fan("Auxiliary Fan #2", 4)); + break; } }