diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs index cba3644..aa762b0 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs @@ -374,6 +374,8 @@ internal class Identification return Model.X570_Taichi; case var _ when name.Equals("X570 Phantom Gaming-ITX/TB3", StringComparison.OrdinalIgnoreCase): return Model.X570_Phantom_Gaming_ITX; + case var _ when name.Equals("X570 Phantom Gaming 4", StringComparison.OrdinalIgnoreCase): + return Model.X570_Phantom_Gaming_4; case var _ when name.Equals("AX370-Gaming 5", StringComparison.OrdinalIgnoreCase): return Model.AX370_Gaming_5; case var _ when name.Equals("TUF X470-PLUS GAMING", StringComparison.OrdinalIgnoreCase): diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs index a0b099f..371283a 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs @@ -37,6 +37,7 @@ public enum Model Z690_Extreme, Z690_Steel_Legend, Z790_Pro_RS, + X570_Phantom_Gaming_4, Z790_Taichi, B650M_C, H61M_DGS, diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs index 7082d0c..7929944 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs @@ -382,12 +382,12 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("+12V", 0)); v.Add(new Voltage("+5V", 1)); v.Add(new Voltage("CPU Northbridge/SoC", 2)); - v.Add(new Voltage("DRAM", 3, 1, 1)); + v.Add(new Voltage("DIMM", 3, 1, 1)); v.Add(new Voltage("Vcore", 4, -1, 2)); v.Add(new Voltage("Chipset", 5)); v.Add(new Voltage("CPU System Agent", 6)); v.Add(new Voltage("+3.3V", 8)); - v.Add(new Voltage("CPU 1.8V", 9)); + v.Add(new Voltage("+1.8V", 9)); v.Add(new Voltage("CPU VDDP", 10)); v.Add(new Voltage("+3V Standby", 11)); v.Add(new Voltage("AVSB", 12)); @@ -428,7 +428,7 @@ internal sealed class SuperIOHardware : Hardware 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 Voltage Termination", 9)); + 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)); @@ -620,7 +620,7 @@ internal sealed class SuperIOHardware : Hardware { case Model.LP_BI_P45_T2RS_Elite: // IT8718F v.Add(new Voltage("Vcore", 0)); - v.Add(new Voltage("CPU Voltage Termination", 1)); + v.Add(new Voltage("CPU Termination", 1)); v.Add(new Voltage("+3.3V", 2)); v.Add(new Voltage("+5V", 3, 6.8f, 10)); v.Add(new Voltage("+12V", 4, 30, 10)); @@ -639,11 +639,11 @@ internal sealed class SuperIOHardware : Hardware case Model.LP_DK_P55_T3EH9: // IT8720F v.Add(new Voltage("Vcore", 0)); - v.Add(new Voltage("CPU Voltage Termination", 1)); + v.Add(new Voltage("CPU Termination", 1)); v.Add(new Voltage("+3.3V", 2)); v.Add(new Voltage("+5V", 3, 6.8f, 10)); v.Add(new Voltage("+12V", 4, 30, 10)); - v.Add(new Voltage("CPU PLL", 5)); + v.Add(new Voltage("Phase Locked Loop", 5)); v.Add(new Voltage("DIMM", 6)); v.Add(new Voltage("+5VSB", 7, 6.8f, 10)); v.Add(new Voltage("CMOS Battery", 8)); @@ -658,7 +658,7 @@ internal sealed class SuperIOHardware : Hardware default: v.Add(new Voltage("Vcore", 0)); - v.Add(new Voltage("CPU Voltage Termination", 1, true)); + v.Add(new Voltage("CPU Termination", 1, true)); v.Add(new Voltage("+3.3V", 2, true)); v.Add(new Voltage("+5V", 3, 6.8f, 10, 0, true)); v.Add(new Voltage("+12V", 4, 30, 10, 0, true)); @@ -1079,12 +1079,12 @@ internal sealed class SuperIOHardware : Hardware case Model.ROG_ZENITH_EXTREME: // IT8665E v.Add(new Voltage("Vcore", 0, 10, 10)); - v.Add(new Voltage("DIMM AB", 1, 10, 10)); + v.Add(new Voltage("DIMM A/B", 1, 10, 10)); v.Add(new Voltage("+12V", 2, 5, 1)); v.Add(new Voltage("+5V", 3, 1.5f, 1)); v.Add(new Voltage("Southbridge 1.05V", 4, 10, 10)); - v.Add(new Voltage("DIMM CD", 5, 10, 10)); - v.Add(new Voltage("1.8V PLL", 6, 10, 10)); + v.Add(new Voltage("DIMM C/D", 5, 10, 10)); + v.Add(new Voltage("Phase Locked Loop", 6, 10, 10)); v.Add(new Voltage("+3.3V", 7, 10, 10)); v.Add(new Voltage("CMOS Battery", 8, 10, 10)); t.Add(new Temperature("CPU", 0)); @@ -1204,7 +1204,7 @@ internal sealed class SuperIOHardware : Hardware { case Model.H61M_DS2_REV_1_2: // IT8728F case Model.H61M_USB3_B3_REV_2_0: // IT8728F - v.Add(new Voltage("CPU Voltage Termination", 0)); + v.Add(new Voltage("CPU Termination", 0)); v.Add(new Voltage("+12V", 2, 30.9f, 10)); v.Add(new Voltage("Vcore", 5)); v.Add(new Voltage("DIMM", 6)); @@ -1219,7 +1219,7 @@ internal sealed class SuperIOHardware : Hardware case Model.H67A_UD3H_B3: // IT8728F case Model.H67A_USB3_B3: // IT8728F - v.Add(new Voltage("CPU Voltage Termination", 0)); + v.Add(new Voltage("CPU Termination", 0)); v.Add(new Voltage("+5V", 1, 15, 10)); v.Add(new Voltage("+12V", 2, 30.9f, 10)); v.Add(new Voltage("Vcore", 5)); @@ -1236,7 +1236,7 @@ internal sealed class SuperIOHardware : Hardware break; case Model.B75M_D3H: // IT8728F - v.Add(new Voltage("CPU Voltage Termination", 0)); + v.Add(new Voltage("CPU Termination", 0)); v.Add(new Voltage("+3.3V", 1, 6.49f, 10)); v.Add(new Voltage("+5V", 3, 15, 10)); v.Add(new Voltage("+12V", 2, 10, 2)); @@ -1327,10 +1327,10 @@ internal sealed class SuperIOHardware : Hardware 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)); - // NO DIMM CD channels on this motherboard; gives a very tiny voltage reading - // v.Add(new Voltage("DIMM CD", 4, 0, 1)); + // NO DIMM C/D channels on this motherboard; gives a very tiny voltage reading + // v.Add(new Voltage("DIMM C/D", 4, 0, 1)); v.Add(new Voltage("iGPU VAXG", 5, 0, 1)); - v.Add(new Voltage("DIMM AB", 6, 0, 1)); + v.Add(new Voltage("DIMM A/B", 6, 0, 1)); v.Add(new Voltage("+3V Standby", 7, 10, 10)); v.Add(new Voltage("CMOS Battery", 8, 10, 10)); v.Add(new Voltage("AVCC3", 9, 54, 10)); @@ -1383,9 +1383,9 @@ internal sealed class SuperIOHardware : Hardware 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("DIMM CD", 4, 0, 1)); + v.Add(new Voltage("DIMM C/D", 4, 0, 1)); v.Add(new Voltage("Vcore SoC", 5, 0, 1)); - v.Add(new Voltage("DIMM AB", 6, 0, 1)); + v.Add(new Voltage("DIMM A/B", 6, 0, 1)); v.Add(new Voltage("+3V Standby", 7, 10, 10)); v.Add(new Voltage("CMOS Battery", 8, 10, 10)); v.Add(new Voltage("AVCC3", 9, 54, 10)); @@ -1410,7 +1410,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("+5V", 3, 1.5F, 1)); v.Add(new Voltage("Vcore SoC", 4, 0, 1)); v.Add(new Voltage("VDDP", 5, 0, 1)); - v.Add(new Voltage("DRAM", 6, 0, 1)); + v.Add(new Voltage("DIMM", 6, 0, 1)); v.Add(new Voltage("+3V Standby", 7, 10, 10)); v.Add(new Voltage("CMOS Battery", 8, 10, 10)); t.Add(new Temperature("System", 0)); @@ -1441,7 +1441,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("+5V", 3, 1.5F, 1)); v.Add(new Voltage("Vcore SoC", 4, 0, 1)); v.Add(new Voltage("VDDP", 5, 0, 1)); - v.Add(new Voltage("DRAM", 6, 0, 1)); + v.Add(new Voltage("DIMM", 6, 0, 1)); v.Add(new Voltage("+3V Standby", 7, 10, 10)); v.Add(new Voltage("CMOS Battery", 8, 10, 10)); t.Add(new Temperature("System", 0)); @@ -1469,7 +1469,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("+5V", 3, 1.5F, 1)); v.Add(new Voltage("Vcore SoC", 4, 0, 1)); v.Add(new Voltage("VDDP", 5, 0, 1)); - v.Add(new Voltage("DRAM", 6, 0, 1)); + v.Add(new Voltage("DIMM", 6, 0, 1)); v.Add(new Voltage("+3V Standby", 7, 10, 10)); v.Add(new Voltage("CMOS Battery", 8, 10, 10)); t.Add(new Temperature("System", 0)); @@ -1497,7 +1497,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("+5V", 3, 1.5F, 1)); v.Add(new Voltage("Vcore SoC", 4, 0, 1)); v.Add(new Voltage("VDDP", 5, 0, 1)); - v.Add(new Voltage("DRAM", 6, 0, 1)); + v.Add(new Voltage("DIMM", 6, 0, 1)); v.Add(new Voltage("+3V Standby", 7, 10, 10)); v.Add(new Voltage("CMOS Battery", 8, 10, 10)); t.Add(new Temperature("System", 0)); @@ -1519,7 +1519,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("+5V", 3, 1.5F, 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("DIMM A/B", 6, 0, 1)); v.Add(new Voltage("+3V Standby", 7, 10, 10)); v.Add(new Voltage("CMOS Battery", 8, 10, 10)); v.Add(new Voltage("AVCC3", 9, 54, 10)); @@ -1547,7 +1547,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("+5V", 3, 15f, 10f)); v.Add(new Voltage("iGPU VAGX", 4)); v.Add(new Voltage("CPU System Agent", 5)); - v.Add(new Voltage("DRAM", 6)); + v.Add(new Voltage("DIMM", 6)); v.Add(new Voltage("+3V Standby", 7, 10f, 10f)); v.Add(new Voltage("CMOS Battery", 8, 10f, 10f)); v.Add(new Voltage("AVCC3", 9, 59.9f, 9.8f)); @@ -1618,7 +1618,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("+5V", 3, 15f, 10f)); v.Add(new Voltage("CPU Vcore", 4, 0, 1)); v.Add(new Voltage("CPU System Agent", 5, 0, 1)); - v.Add(new Voltage("DIMM AB", 6, 0, 1)); + v.Add(new Voltage("DIMM A/B", 6, 0, 1)); v.Add(new Voltage("+3V Standby", 7, 1, 1)); v.Add(new Voltage("CMOS Battery", 8, 1, 1)); t.Add(new Temperature("System #1", 0)); @@ -1648,7 +1648,7 @@ internal sealed class SuperIOHardware : Hardware 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("DIMM A/B", 6)); v.Add(new Voltage("+3V Standby", 7, 1f, 10f)); v.Add(new Voltage("CMOS Battery", 8, 1f, 10f)); t.Add(new Temperature("System #1", 0)); @@ -1677,7 +1677,7 @@ internal sealed class SuperIOHardware : Hardware 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("DIMM A/B", 6)); v.Add(new Voltage("+3V Standby", 7, 10f, 10f)); v.Add(new Voltage("CMOS Battery", 8, 10f, 10f)); t.Add(new Temperature("System #1", 0)); @@ -1706,7 +1706,7 @@ internal sealed class SuperIOHardware : Hardware 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("DIMM A/B", 6)); t.Add(new Temperature("System #1", 0)); t.Add(new Temperature("System #2", 1)); t.Add(new Temperature("CPU", 2)); @@ -1841,7 +1841,7 @@ internal sealed class SuperIOHardware : Hardware break; case Model.Z68A_D3H_B3: // IT8728F - v.Add(new Voltage("CPU Voltage Termination", 0)); + v.Add(new Voltage("CPU Termination", 0)); v.Add(new Voltage("+3.3V", 1, 6.49f, 10)); v.Add(new Voltage("+12V", 2, 30.9f, 10)); v.Add(new Voltage("+5V", 3, 7.15f, 10)); @@ -1864,7 +1864,7 @@ internal sealed class SuperIOHardware : Hardware case Model.Z68AP_D3: // IT8728F case Model.Z68X_UD3H_B3: // IT8728F case Model.Z68XP_UD3R: // IT8728F - v.Add(new Voltage("CPU Voltage Termination", 0)); + v.Add(new Voltage("CPU Termination", 0)); v.Add(new Voltage("+3.3V", 1, 6.49f, 10)); v.Add(new Voltage("+12V", 2, 30.9f, 10)); v.Add(new Voltage("+5V", 3, 7.15f, 10)); @@ -1882,7 +1882,7 @@ internal sealed class SuperIOHardware : Hardware break; case Model.Z68X_UD7_B3: // IT8728F - v.Add(new Voltage("CPU Voltage Termination", 0)); + v.Add(new Voltage("CPU Termination", 0)); v.Add(new Voltage("+3.3V", 1, 6.49f, 10)); v.Add(new Voltage("+12V", 2, 30.9f, 10)); v.Add(new Voltage("+5V", 3, 7.15f, 10)); @@ -1902,13 +1902,13 @@ internal sealed class SuperIOHardware : Hardware break; case Model.X79_UD3: // IT8728F - v.Add(new Voltage("CPU Voltage Termination", 0)); - v.Add(new Voltage("DIMM AB", 1)); + v.Add(new Voltage("CPU Termination", 0)); + v.Add(new Voltage("DIMM A/B", 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 CD", 6)); + v.Add(new Voltage("DIMM C/D", 6)); v.Add(new Voltage("+3V Standby", 7, 1, 1)); v.Add(new Voltage("CMOS Battery", 8, 1, 1)); t.Add(new Temperature("System", 0)); @@ -1932,7 +1932,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("+5V", 3, 1.5F, 1)); v.Add(new Voltage("Vcore SoC", 4, 0, 1)); v.Add(new Voltage("VDDP", 5, 0, 1)); - v.Add(new Voltage("DRAM", 6, 0, 1)); + v.Add(new Voltage("DIMM", 6, 0, 1)); v.Add(new Voltage("+3V Standby", 7, 10, 10)); v.Add(new Voltage("CMOS Battery", 8, 10, 10)); t.Add(new Temperature("System #1", 0)); @@ -1966,7 +1966,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("+5V", 3, 1.5F, 1)); v.Add(new Voltage("Vcore SoC", 4, 0, 1)); v.Add(new Voltage("VDDP", 5, 0, 1)); - v.Add(new Voltage("DRAM", 6, 0, 1)); + v.Add(new Voltage("DIMM", 6, 0, 1)); v.Add(new Voltage("+3V Standby", 7, 10, 10)); v.Add(new Voltage("CMOS Battery", 8, 10, 10)); t.Add(new Temperature("System #1", 0)); @@ -2001,7 +2001,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("+5V", 3, 1.5F, 1)); v.Add(new Voltage("Vcore SoC", 4, 0, 1)); v.Add(new Voltage("VDDP", 5, 0, 1)); - v.Add(new Voltage("DRAM", 6, 0, 1)); + v.Add(new Voltage("DIMM", 6, 0, 1)); v.Add(new Voltage("+3V Standby", 7, 10, 10)); v.Add(new Voltage("CMOS Battery", 8, 10, 10)); t.Add(new Temperature("System", 0)); @@ -2026,7 +2026,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("+5V", 3, 1.5F, 1)); v.Add(new Voltage("iGPU", 4)); v.Add(new Voltage("CPU Input Auxiliary", 5)); - v.Add(new Voltage("DRAM", 6)); + v.Add(new Voltage("DIMM", 6)); v.Add(new Voltage("+3V Standby", 7, 10, 10)); v.Add(new Voltage("CMOS Battery", 8, 10, 10)); t.Add(new Temperature("System #1", 0)); @@ -2052,7 +2052,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("Vcore", 0)); v.Add(new Voltage("VAXG", 1)); v.Add(new Voltage("CPU Input Auxiliary", 2)); - v.Add(new Voltage("DIMM AB", 3)); + v.Add(new Voltage("DIMM A/B", 3)); v.Add(new Voltage("+12V", 4)); v.Add(new Voltage("+3.3V", 5)); v.Add(new Voltage("+5V", 6)); @@ -2396,7 +2396,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("VCC3V", 0, 150, 150)); v.Add(new Voltage("Vcore", 1, 47, 100)); v.Add(new Voltage("DIMM", 2, 47, 100)); - v.Add(new Voltage("CPU Voltage Termination", 3, 24, 100)); + v.Add(new Voltage("CPU Termination", 3, 24, 100)); v.Add(new Voltage("IOH Vcore", 4, 24, 100)); v.Add(new Voltage("+5V", 5, 51, 12)); v.Add(new Voltage("+12V", 6, 56, 6.8f)); @@ -2415,7 +2415,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("VCC3V", 0, 150, 150)); v.Add(new Voltage("Vcore", 1, 47, 100)); v.Add(new Voltage("DIMM", 2, 47, 100)); - v.Add(new Voltage("CPU Voltage Termination", 3, 24, 100)); + v.Add(new Voltage("CPU Termination", 3, 24, 100)); v.Add(new Voltage("IOH Vcore", 4, 24, 100)); v.Add(new Voltage("+5V", 5, 51, 12)); v.Add(new Voltage("+12V", 6, 56, 6.8f)); @@ -2893,7 +2893,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("Voltage #7", 6, true)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); + v.Add(new Voltage("CPU Termination", 9)); v.Add(new Voltage("Voltage #11", 10, true)); v.Add(new Voltage("Voltage #12", 11, true)); v.Add(new Voltage("Voltage #13", 12, true)); @@ -2932,7 +2932,7 @@ internal sealed class SuperIOHardware : Hardware 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 Voltage Termination", 9)); + 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)); @@ -2961,10 +2961,10 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("+12V", 4, 110, 10)); v.Add(new Voltage("CPU Input Auxiliary", 5, 1, 1)); - v.Add(new Voltage("DRAM", 6)); + v.Add(new Voltage("DIMM", 6)); v.Add(new Voltage("+3.3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9, 1, 1)); + v.Add(new Voltage("CPU Termination", 9, 1, 1)); v.Add(new Voltage("CPU 1.05V", 10, 1, 1)); v.Add(new Voltage("Chipset 0.82V", 11, 1, 1)); v.Add(new Voltage("Chipset 1.0V", 12)); @@ -3001,7 +3001,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("Integrated Memory Controller", 6)); v.Add(new Voltage("+3.3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9, 1, 1)); + v.Add(new Voltage("CPU Termination", 9, 1, 1)); v.Add(new Voltage("CPU 1.05V", 10, 1, 1)); v.Add(new Voltage("Chipset 0.82V", 11, 1, 1)); v.Add(new Voltage("Chipset 1.0V", 12)); @@ -3028,8 +3028,80 @@ internal sealed class SuperIOHardware : Hardware t.Add(new Temperature("Motherboard", 2)); break; + case Model.X570_Phantom_Gaming_4: // NCT6796D (-R?) + // internal on NCT6796D have a 1/2 voltage divider (by way of two 34kOhm resistors) + // "Six internal signals connected to the power supplies (CPUVCORE, AVSB, VBAT, VTT, 3VSB, 3VCC)" + // "All the internal inputs of the ADC, AVSB, VBAT, 3VSB, 3VCC utilize an integrated voltage divider + // with both resistors equal to 34kOhm" + // it seems that VTT doesn't actually have the 1/2 divider + + // external sources can have whatever divider that gets them in the 0V to 2.048V range + + // assuming Vf = 0, then Ri = R1 and Rf = R2 (from voltage divider equation) + + v.Add(new Voltage("Vcore", 0, 1, 1)); + v.Add(new Voltage("+5V", 1, 2, 1)); + v.Add(new Voltage("AVCC", 2, 1, 1)); + v.Add(new Voltage("+3.3V", 3, 1, 1)); + v.Add(new Voltage("+12V", 4, 56, 10)); + v.Add(new Voltage("CPU SoC", 5)); + v.Add(new Voltage("DIMM", 6)); + v.Add(new Voltage("+3V Standby", 7, 1, 1)); + v.Add(new Voltage("CMOS Battery", 8, 1, 1)); + v.Add(new Voltage("DIMM Termination", 9)); + //v.Add(new Voltage("Voltage #11", 10, true)); // unknown. VIN5 pin + v.Add(new Voltage("VPPM", 11, 3, 1)); + v.Add(new Voltage("PREM CPU SoC", 12)); + v.Add(new Voltage("DIMM Write", 13)); + v.Add(new Voltage("+1.8V", 14, 1, 1)); + //v.Add(new Voltage("Voltage #16", 15, true)); // unknown. VIN9 pin + + t.Add(new Temperature("CPU", 9)); // AKA SMBUSMASTER0 + t.Add(new Temperature("Chipset", 10)); // AKA SMBUSMASTER1 + t.Add(new Temperature("Motherboard", 2)); // AKA SYSTIN + + // no idea what these sources are actually connected to. + //t.Add(new Temperature("CPUTIN", 1)); + //t.Add(new Temperature("AUXTIN0", 3)); + //t.Add(new Temperature("AUXTIN1", 4)); + //t.Add(new Temperature("AUXTIN2", 5)); + //t.Add(new Temperature("AUXTIN3", 6)); + //t.Add(new Temperature("AUXTIN4", 7)); + //t.Add(new Temperature("TSENSOR", 8)); + //t.Add(new Temperature("VIRTUAL_TEMP", 24)); + + // CHA_FAN3 header + f.Add(new Fan("Chassis Fan #3", 0)); + c.Add(new Control("Chassis Fan #3", 0)); + + // CPU_FAN1 header + f.Add(new Fan("CPU Fan #1", 1)); + c.Add(new Control("CPU Fan #1", 1)); + + // CPU_FAN2/WP header + f.Add(new Fan("CPU Fan #2", 2)); + c.Add(new Control("CPU Fan #2", 2)); + + // CHA_FAN1/WP header + f.Add(new Fan("Chassis Fan #1", 3)); + c.Add(new Control("Chassis Fan #1", 3)); + + // CHA_FAN2/WP header + f.Add(new Fan("Chassis Fan #2", 4)); + c.Add(new Control("Chassis Fan #2", 4)); + + // SB_FAN1 header + f.Add(new Fan("Chipset Fan", 5)); + c.Add(new Control("Chipset Fan", 5)); + + // fan/control 6 is not exposed to a header + //f.Add(new Fan("Fan #7", 6)); + //c.Add(new Control("Fan #7", 6)); + + break; + case Model.Z790_Taichi: - v.Add(new Voltage("CPU 1.8V", 0)); + v.Add(new Voltage("+1.8V", 0)); v.Add(new Voltage("Chipset 0.82V", 1)); v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("CPU 1.05V", 4)); @@ -3053,11 +3125,11 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("+1.05V ALW", 5)); v.Add(new Voltage("+3.3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9, 1, 1)); + v.Add(new Voltage("CPU Termination", 9, 1, 1)); v.Add(new Voltage("Vcore SoC", 10, 1, 1)); v.Add(new Voltage("Vcore Misc", 11, 1, 1)); v.Add(new Voltage("+1.8V", 13, 1, 1)); - v.Add(new Voltage("DRAM", 14)); + v.Add(new Voltage("DIMM", 14)); t.Add(new Temperature("CPU Core", 9)); t.Add(new Temperature("Motherboard", 2)); @@ -3085,7 +3157,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("Voltage #7", 6, true)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); + v.Add(new Voltage("CPU Termination", 9)); v.Add(new Voltage("Voltage #11", 10, true)); v.Add(new Voltage("Voltage #12", 11, true)); v.Add(new Voltage("Voltage #13", 12, true)); @@ -3123,7 +3195,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("Voltage #7", 6, true)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); + v.Add(new Voltage("CPU Termination", 9)); v.Add(new Voltage("Voltage #11", 10, true)); v.Add(new Voltage("Voltage #12", 11, true)); v.Add(new Voltage("Voltage #13", 12, true)); @@ -3153,11 +3225,11 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("CPU Graphics", 6, 2, 2)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); + v.Add(new Voltage("CPU Termination", 9)); v.Add(new Voltage("DIMM", 10, 1, 1)); v.Add(new Voltage("CPU System Agent", 11)); v.Add(new Voltage("PCH Core", 12)); - v.Add(new Voltage("CPU PLLs", 13)); + v.Add(new Voltage("Phase Locked Loop", 13)); v.Add(new Voltage("CPU VCCIO/IMC", 14)); t.Add(new Temperature("CPU (PECI)", 0)); t.Add(new Temperature("T2", 1)); @@ -3189,11 +3261,11 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("CPU Graphics", 6, 2, 2)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); + v.Add(new Voltage("CPU Termination", 9)); v.Add(new Voltage("DIMM", 10, 1, 1)); v.Add(new Voltage("CPU System Agent", 11)); v.Add(new Voltage("PCH Core", 12)); - v.Add(new Voltage("CPU PLLs", 13)); + v.Add(new Voltage("Phase Locked Loop", 13)); v.Add(new Voltage("CPU VCCIO/IMC", 14)); t.Add(new Temperature("CPU (PECI)", 0)); t.Add(new Temperature("CPU", 1)); @@ -3231,7 +3303,7 @@ internal sealed class SuperIOHardware : Hardware //v.Add(new Voltage("DIMM", 10, 1, 1)); //v.Add(new Voltage("CPU System Agent", 11)); //v.Add(new Voltage("PCH Core", 12)); - //v.Add(new Voltage("CPU PLLs", 13)); + //v.Add(new Voltage("Phase Locked Loop", 13)); //v.Add(new Voltage("CPU VCCIO/IMC", 14)); t.Add(new Temperature("CPU (PECI)", 0)); @@ -3256,7 +3328,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("+12V", 4, 11, 1)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); + v.Add(new Voltage("CPU Termination", 9)); t.Add(new Temperature("CPU", 22)); t.Add(new Temperature("Motherboard", 2)); @@ -3289,7 +3361,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("Voltage #7", 6, true)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); + v.Add(new Voltage("CPU Termination", 9)); v.Add(new Voltage("Voltage #11", 10, true)); v.Add(new Voltage("Voltage #12", 11, true)); v.Add(new Voltage("Voltage #13", 12, true)); @@ -3341,11 +3413,11 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("CPU SoC", 6)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); + v.Add(new Voltage("CPU Termination", 9)); v.Add(new Voltage("Voltage #11", 10, true)); v.Add(new Voltage("Voltage #12", 11, true)); v.Add(new Voltage("Voltage #13", 12, true)); - v.Add(new Voltage("DRAM", 13)); + v.Add(new Voltage("DIMM", 13)); v.Add(new Voltage("Voltage #15", 14, true)); t.Add(new Temperature("PECI 0", 0)); t.Add(new Temperature("CPU", 1)); @@ -3397,11 +3469,11 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("CPU Graphics", 6)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9, 1, 1)); + v.Add(new Voltage("CPU Termination", 9, 1, 1)); v.Add(new Voltage("DIMM", 10)); v.Add(new Voltage("CPU VCCIO", 11, 1, 1)); v.Add(new Voltage("PCH Core", 12)); - v.Add(new Voltage("CPU PLLs", 13)); + v.Add(new Voltage("Phase Locked Loop", 13)); v.Add(new Voltage("CPU System Agent", 14)); t.Add(new Temperature("Motherboard", 0)); @@ -3479,11 +3551,11 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("CPU Graphics", 6, 2, 2)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); + v.Add(new Voltage("CPU Termination", 9)); v.Add(new Voltage("DIMM", 10, 1, 1)); v.Add(new Voltage("CPU System Agent", 11)); v.Add(new Voltage("PCH Core", 12)); - v.Add(new Voltage("CPU PLLs", 13)); + v.Add(new Voltage("Phase Locked Loop", 13)); v.Add(new Voltage("CPU VCCIO/IMC", 14)); t.Add(new Temperature("CPU (PECI)", 0)); t.Add(new Temperature("T2", 1)); @@ -3513,7 +3585,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("Voltage #7", 6)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9, 1, 1)); + v.Add(new Voltage("CPU Termination", 9, 1, 1)); v.Add(new Voltage("Voltage #11", 10)); v.Add(new Voltage("IVR Atom L2 Cluster #0", 11, 1, 1)); v.Add(new Voltage("PCH", 12)); @@ -3556,7 +3628,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("Voltage #7", 6)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9, 1, 1)); + v.Add(new Voltage("CPU Termination", 9, 1, 1)); v.Add(new Voltage("Voltage #11", 10)); v.Add(new Voltage("IVR Atom L2 Cluster #0", 11, 1, 1)); v.Add(new Voltage("PCH", 12)); @@ -3602,7 +3674,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("Voltage #7", 6)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9, 1, 1)); + v.Add(new Voltage("CPU Termination", 9, 1, 1)); v.Add(new Voltage("Voltage #11", 10)); v.Add(new Voltage("IVR Atom L2 Cluster #0", 11, 1, 1)); v.Add(new Voltage("PCH", 12)); @@ -3689,7 +3761,7 @@ internal sealed class SuperIOHardware : Hardware //v.Add(new Voltage("#Unused #6", 6, 0, 1, 0, true)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); + v.Add(new Voltage("CPU Termination", 9)); //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, 0, 1, 0, true)); @@ -3761,9 +3833,9 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("+5V", 1, 4, 1)); v.Add(new Voltage("+3.3V", 3, 34, 34)); v.Add(new Voltage("+12V", 4, 6, 1)); - v.Add(new Voltage("DIMM CD", 11, 10, 10)); - v.Add(new Voltage("DIMM AB", 13)); - v.Add(new Voltage("1.8V PPL", 14)); + v.Add(new Voltage("DIMM C/D", 11, 10, 10)); + v.Add(new Voltage("DIMM A/B", 13)); + v.Add(new Voltage("Phase Locked Loop", 14)); t.Add(new Temperature("CPU", 1)); t.Add(new Temperature("Motherboard", 2)); @@ -3822,7 +3894,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("+12V", 4, 11, 1)); //Probably not updating properly v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); + v.Add(new Voltage("CPU Termination", 9)); t.Add(new Temperature("CPU", 1)); t.Add(new Temperature("Motherboard", 2)); t.Add(new Temperature("Temperature #3", 3)); @@ -3876,7 +3948,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("Voltage #7", 6, true)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); + v.Add(new Voltage("CPU Termination", 9)); v.Add(new Voltage("Voltage #11", 10, true)); v.Add(new Voltage("Voltage #12", 11, true)); v.Add(new Voltage("Voltage #13", 12, true)); @@ -3902,7 +3974,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("Voltage #7", 6, true)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); // This is wrong + v.Add(new Voltage("CPU Termination", 9)); // This is wrong v.Add(new Voltage("Voltage #11", 10, true)); v.Add(new Voltage("Voltage #12", 11, true)); v.Add(new Voltage("Voltage #13", 12, true)); @@ -3936,7 +4008,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("Voltage #7", 6, true)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); // This is wrong + v.Add(new Voltage("CPU Termination", 9)); // This is wrong v.Add(new Voltage("Voltage #11", 10, true)); v.Add(new Voltage("Voltage #12", 11, true)); v.Add(new Voltage("Voltage #13", 12, true)); @@ -3966,7 +4038,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("+12V", 4, 11, 1)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - //v.Add(new Voltage("CPU Voltage Termination", 9)); // This is wrong + //v.Add(new Voltage("CPU Termination", 9)); // This is wrong t.Add(new Temperature("CPU", 22)); t.Add(new Temperature("Motherboard", 2)); t.Add(new Temperature("T_Sensor", 24)); // Aligned with Armoury Crate @@ -3990,7 +4062,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("Voltage #7", 6, true)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); + v.Add(new Voltage("CPU Termination", 9)); v.Add(new Voltage("Voltage #11", 10, true)); v.Add(new Voltage("Voltage #12", 11, true)); v.Add(new Voltage("Voltage #13", 12, true)); @@ -4026,7 +4098,7 @@ internal sealed class SuperIOHardware : Hardware //v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("CPU I/O", 6)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); + v.Add(new Voltage("CPU Termination", 9)); v.Add(new Voltage("CPU System Agent", 10)); //v.Add(new Voltage("Voltage #12", 11, true)); v.Add(new Voltage("Northbridge/SoC", 12)); @@ -4054,7 +4126,7 @@ internal sealed class SuperIOHardware : Hardware //v.Add(new Voltage("Voltage #6", 5, false)); //v.Add(new Voltage("CPU I/O", 6)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); + v.Add(new Voltage("CPU Termination", 9)); v.Add(new Voltage("CPU System Agent", 10)); //v.Add(new Voltage("Voltage #12", 11, false)); v.Add(new Voltage("Northbridge/SoC", 12)); @@ -4090,7 +4162,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("CPU I/O", 6)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); + v.Add(new Voltage("CPU Termination", 9)); v.Add(new Voltage("CPU System Agent", 10)); v.Add(new Voltage("Voltage #12", 11, true)); v.Add(new Voltage("PCH", 12)); @@ -4128,7 +4200,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("VIN4", 6, false)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); + v.Add(new Voltage("CPU Termination", 9)); //v.Add(new Voltage("Voltage #11", 10)); v.Add(new Voltage("Voltage #11", 11)); v.Add(new Voltage("CPU NB/SoC", 12)); @@ -4169,7 +4241,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("Voltage #7", 6, true)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); + v.Add(new Voltage("CPU Termination", 9)); v.Add(new Voltage("Voltage #11", 10, true)); v.Add(new Voltage("Voltage #12", 11, true)); v.Add(new Voltage("Voltage #13", 12, true)); @@ -4204,7 +4276,7 @@ internal sealed class SuperIOHardware : Hardware v.Add(new Voltage("Voltage #7", 6, true)); v.Add(new Voltage("+3V Standby", 7, 34, 34)); v.Add(new Voltage("CMOS Battery", 8, 34, 34)); - v.Add(new Voltage("CPU Voltage Termination", 9)); + v.Add(new Voltage("CPU Termination", 9)); v.Add(new Voltage("Voltage #11", 10, true)); v.Add(new Voltage("Voltage #12", 11, true)); v.Add(new Voltage("Voltage #13", 12, true));