From 51a84b9033e46c5ed1da77f574a3704f3d749bba Mon Sep 17 00:00:00 2001 From: Tellinq <59412384+Tellinq@users.noreply.github.com> Date: Wed, 26 Jun 2024 04:46:55 -0400 Subject: [PATCH] Add proper definition support for all Gigabyte B450 models (#1367) * Add B450M DS3H and its variants Note: From what I've seen some DS3H will report with a -CF suffix. Unsure if this applies to all B450 models or just a select few. Will be researching more * Add the rest of B450M * Add all Gigabyte B450 models * Remove AVCC3 This is not a real source, especially since we already have the +3.3V rail --- .../Hardware/Motherboard/Identification.cs | 38 ++++++ .../Hardware/Motherboard/Model.cs | 11 ++ .../Hardware/Motherboard/SuperIOHardware.cs | 109 ++++++++++++++++++ 3 files changed, 158 insertions(+) diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs index 69fdce4..6d89414 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Identification.cs @@ -380,6 +380,44 @@ internal class Identification return Model.B450A_PRO; case var _ when name.Equals("B350 GAMING PLUS (MS-7A34)", StringComparison.OrdinalIgnoreCase): return Model.B350_Gaming_Plus; + case var _ when name.Equals("B450 AORUS PRO", StringComparison.OrdinalIgnoreCase): + case var _ when name.Equals("B450 AORUS PRO WIFI", StringComparison.OrdinalIgnoreCase): + return Model.B450_AORUS_PRO; + case var _ when name.Equals("B450 GAMING X", StringComparison.OrdinalIgnoreCase): + return Model.B450_GAMING_X; + case var _ when name.Equals("B450 AORUS ELITE", StringComparison.OrdinalIgnoreCase): + case var _ when name.Equals("B450 AORUS ELITE V2", StringComparison.OrdinalIgnoreCase): + return Model.B450_AORUS_ELITE; + case var _ when name.Equals("B450M AORUS ELITE", StringComparison.OrdinalIgnoreCase): + case var _ when name.Equals("B450M AORUS ELITE-CF", StringComparison.OrdinalIgnoreCase): + return Model.B450M_AORUS_ELITE; + case var _ when name.Equals("B450M GAMING", StringComparison.OrdinalIgnoreCase): + case var _ when name.Equals("B450M GAMING-CF", StringComparison.OrdinalIgnoreCase): + return Model.B450M_GAMING; + case var _ when name.Equals("B450M AORUS M", StringComparison.OrdinalIgnoreCase): + case var _ when name.Equals("B450M AORUS M-CF", StringComparison.OrdinalIgnoreCase): + return Model.B450_AORUS_M; + case var _ when name.Equals("B450M DS3H", StringComparison.OrdinalIgnoreCase): + case var _ when name.Equals("B450M DS3H WIFI", StringComparison.OrdinalIgnoreCase): + case var _ when name.Equals("B450M DS3H-CF", StringComparison.OrdinalIgnoreCase): + case var _ when name.Equals("B450M DS3H WIFI-CF", StringComparison.OrdinalIgnoreCase): + case var _ when name.Equals("B450M DS3H V2", StringComparison.OrdinalIgnoreCase): + case var _ when name.Equals("B450M DS3H V2-CF", StringComparison.OrdinalIgnoreCase): + return Model.B450M_DS3H; + case var _ when name.Equals("B450M S2H", StringComparison.OrdinalIgnoreCase): + case var _ when name.Equals("B450M S2H V2", StringComparison.OrdinalIgnoreCase): + case var _ when name.Equals("B450M S2H-CF", StringComparison.OrdinalIgnoreCase): + case var _ when name.Equals("B450M S2H V2-CF", StringComparison.OrdinalIgnoreCase): + return Model.B450M_S2H; + case var _ when name.Equals("B450M H", StringComparison.OrdinalIgnoreCase): + case var _ when name.Equals("B450M H-CF", StringComparison.OrdinalIgnoreCase): + return Model.B450M_H; + case var _ when name.Equals("B450M K", StringComparison.OrdinalIgnoreCase): + case var _ when name.Equals("B450M K-CF", StringComparison.OrdinalIgnoreCase): + return Model.B450M_K; + case var _ when name.Equals("B450M I AORUS PRO WIFI", StringComparison.OrdinalIgnoreCase): + case var _ when name.Equals("B450M I AORUS PRO WIFI-CF", StringComparison.OrdinalIgnoreCase): + return Model.B450_I_AORUS_PRO_WIFI; 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): diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs index 81a45cd..5748aee 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/Model.cs @@ -187,6 +187,17 @@ public enum Model Z690_AORUS_MASTER, Z690_GAMING_X_DDR4, Z170N_WIFI, + B450_AORUS_M, + B450_AORUS_PRO, + B450_GAMING_X, + B450_AORUS_ELITE, + B450M_AORUS_ELITE, + B450M_GAMING, + B450_I_AORUS_PRO_WIFI, + B450M_DS3H, + B450M_S2H, + B450M_H, + B450M_K, X470_AORUS_GAMING_7_WIFI, X570_AORUS_MASTER, X570_GAMING_X, diff --git a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs index d6a9201..1a1f065 100644 --- a/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs +++ b/LibreHardwareMonitorLib/Hardware/Motherboard/SuperIOHardware.cs @@ -1334,6 +1334,115 @@ internal sealed class SuperIOHardware : Hardware c.Add(new Control("Fan #" + (i + 1), i)); break; + + case Model.B450_AORUS_PRO: + v.Add(new Voltage("Vcore", 0, 0, 1)); + 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("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("+3V Standby", 7, 10, 10)); + v.Add(new Voltage("CMOS Battery", 8, 10, 10)); + t.Add(new Temperature("System", 0)); + t.Add(new Temperature("Chipset", 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("VSoC MOS", 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)); + f.Add(new Fan("CPU Optional Fan", 4)); + c.Add(new Control("CPU Fan", 0)); + c.Add(new Control("System Fan #1", 1)); + c.Add(new Control("System Fan #2", 2)); + c.Add(new Control("System Fan #3", 3)); + c.Add(new Control("CPU Optional Fan", 4)); + + break; + + case Model.B450_GAMING_X: + case Model.B450_AORUS_ELITE: + case Model.B450M_AORUS_ELITE: + v.Add(new Voltage("Vcore", 0, 0, 1)); + 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("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("+3V Standby", 7, 10, 10)); + v.Add(new Voltage("CMOS Battery", 8, 10, 10)); + t.Add(new Temperature("System", 0)); + t.Add(new Temperature("Chipset", 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("VSoC MOS", 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)); + c.Add(new Control("CPU Fan", 0)); + c.Add(new Control("System Fan #1", 1)); + c.Add(new Control("System Fan #2", 2)); + c.Add(new Control("System Fan #3", 3)); + + break; + + case Model.B450M_GAMING: // ITE IT8686E + case Model.B450_AORUS_M: + v.Add(new Voltage("Vcore", 0, 0, 1)); + 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("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("+3V Standby", 7, 10, 10)); + v.Add(new Voltage("CMOS Battery", 8, 10, 10)); + t.Add(new Temperature("System", 0)); + t.Add(new Temperature("Chipset", 1)); + t.Add(new Temperature("CPU", 2)); + t.Add(new Temperature("VRM MOS", 4)); + t.Add(new Temperature("VSoC MOS", 5)); + f.Add(new Fan("CPU Fan", 0)); + f.Add(new Fan("System Fan #1", 1)); + f.Add(new Fan("System Fan #2", 2)); + c.Add(new Control("CPU Fan", 0)); + c.Add(new Control("System Fan #1", 1)); + c.Add(new Control("System Fan #2", 2)); + + break; + + case Model.B450_I_AORUS_PRO_WIFI: + case Model.B450M_DS3H: // ITE IT8686E + case Model.B450M_S2H: + case Model.B450M_H: + case Model.B450M_K: + v.Add(new Voltage("Vcore", 0, 0, 1)); + 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("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("+3V Standby", 7, 10, 10)); + v.Add(new Voltage("CMOS Battery", 8, 10, 10)); + t.Add(new Temperature("System", 0)); + t.Add(new Temperature("Chipset", 1)); + t.Add(new Temperature("CPU", 2)); + t.Add(new Temperature("VRM MOS", 4)); + t.Add(new Temperature("VSoC MOS", 5)); + f.Add(new Fan("CPU Fan", 0)); + f.Add(new Fan("System Fan", 1)); + c.Add(new Control("CPU Fan", 0)); + c.Add(new Control("System Fan", 1)); + + break; case Model.X470_AORUS_GAMING_7_WIFI: // ITE IT8686E v.Add(new Voltage("Vcore", 0, 0, 1));