From 67d82e0784c8f0963202b4936322738f3914c207 Mon Sep 17 00:00:00 2001 From: Igor Tkachev Date: Wed, 13 Jul 2022 10:23:40 -0400 Subject: [PATCH] ROG Zenith II Extreme support (#777) --- .../Hardware/Motherboard/Identification.cs | 2 + .../Hardware/Motherboard/Model.cs | 1 + .../Hardware/Motherboard/SuperIOHardware.cs | 49 +++++++++++++++++-- 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs index 5a77094..af7854d 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs @@ -317,6 +317,8 @@ namespace LibreHardwareMonitor.Hardware.Motherboard return Model.X399_AORUS_Gaming_7; case var _ when name.Equals("ROG ZENITH EXTREME", StringComparison.OrdinalIgnoreCase): return Model.ROG_ZENITH_EXTREME; + case var _ when name.Equals("ROG ZENITH II EXTREME", StringComparison.OrdinalIgnoreCase): + return Model.ROG_ZENITH_II_EXTREME; case var _ when name.Equals("Z170-A", StringComparison.OrdinalIgnoreCase): return Model.Z170_A; case var _ when name.Equals("Z77 Pro4-M", StringComparison.OrdinalIgnoreCase): diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs index 4c66037..195a042 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs @@ -71,6 +71,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard RAMPAGE_II_GENE, ROG_MAXIMUS_X_APEX, ROG_ZENITH_EXTREME, + ROG_ZENITH_II_EXTREME, TUF_X470_PLUS_GAMING, Z170_A, TUF_GAMING_B550M_PLUS_WIFI, diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs index d55ff44..4c09a7e 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs @@ -1561,11 +1561,11 @@ namespace LibreHardwareMonitor.Hardware.Motherboard case Manufacturer.Biostar: switch (model) { - case Model.B660GTN: //IT8613E + case Model.B660GTN: //IT8613E // This board has some problems with their app controlling fans that I was able to replicate here so I guess is a BIOS problem with the pins. // Biostar is aware so expect changes in the control pins with new bios. // In the meantime, it's possible to control CPUFAN and CPUOPT1m but not SYSFAN1. - // The parameters are extracted from the Biostar app config file. + // The parameters are extracted from the Biostar app config file. v.Add(new Voltage("Vcore", 0, 0, 1)); v.Add(new Voltage("DIMM", 1, 0, 1)); v.Add(new Voltage("+12V", 2, 5, 1)); // Reads higher than it should. @@ -1574,7 +1574,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard //v.Add(new Voltage("VCC ST", 4)); // Reads 4.2V. //v.Add(new Voltage("VCCIN AUX", 5)); // Reads 2.2V. //v.Add(new Voltage("CPU GT", 6)); // Reads 2.6V. - //v.Add(new Voltage("3VSB", 7, 10, 10)); // Reads 5.8V ? + //v.Add(new Voltage("3VSB", 7, 10, 10)); // Reads 5.8V ? v.Add(new Voltage("VBat", 8, 10, 10)); // Reads higher than it should at 3.4V. t.Add(new Temperature("System 1", 0)); t.Add(new Temperature("System 2", 1)); // Not sure what sensor is this. @@ -2657,6 +2657,49 @@ namespace LibreHardwareMonitor.Hardware.Motherboard break; + case Model.ROG_ZENITH_II_EXTREME: // NCT6798D + // Voltage = value + (value - Vf) * Ri / Rf. + v.Add(new Voltage("Vcore", 0)); + 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 Voltage CD", 11, 10, 10)); + v.Add(new Voltage("DIMM Voltage AB", 13)); + v.Add(new Voltage("1.8V PPL Voltage", 14)); + + t.Add(new Temperature("CPU", 1)); + t.Add(new Temperature("Motherboard", 2)); + t.Add(new Temperature("Temperature #3", 3)); + t.Add(new Temperature("Temperature #4", 4)); + t.Add(new Temperature("Temperature #5", 5)); + t.Add(new Temperature("Temperature #6", 6)); + t.Add(new Temperature("Temperature #7", 7)); + t.Add(new Temperature("Temperature #21", 21)); + + for (int i = 0; i < superIO.Fans.Length; i++) + { + switch (i) + { + case 0: f.Add(new Fan("Chassis Fan", 0)); break; + case 1: f.Add(new Fan("CPU Fan", 1)); break; + case 2: f.Add(new Fan("CPU Optional Fan", 2)); break; + case 4: f.Add(new Fan("AIO Pump", 4)); break; + } + } + + for (int i = 0; i < superIO.Controls.Length; i++) + { + switch (i) + { + case 0: c.Add(new Ctrl("Chassis Fan Control", 0)); break; + case 1: c.Add(new Ctrl("CPU Fan Control", 1)); break; + case 2: c.Add(new Ctrl("CPU Optional Fan Control", 2)); break; + case 4: c.Add(new Ctrl("AIO Pump Control", 4)); break; + } + } + + break; + case Model.ROG_STRIX_X570_I_GAMING: //NCT6798D v.Add(new Voltage("Vcore", 0, 10, 10)); v.Add(new Voltage("+5V", 1, 4, 1)); //Probably not updating properly