Update motherboards (#142)

Add B350 Gaming Plus.
Change motherboard identifications to use OrdinalIgnoreCase
This commit is contained in:
Phyxion
2019-10-10 13:58:53 +02:00
committed by GitHub
parent b0d4beed26
commit 4fa069d525
3 changed files with 196 additions and 198 deletions
@@ -3,6 +3,8 @@
// Copyright (C) LibreHardwareMonitor and Contributors
// All Rights Reserved
using System;
namespace LibreHardwareMonitor.Hardware.Motherboard
{
internal class Identification
@@ -11,60 +13,53 @@ namespace LibreHardwareMonitor.Hardware.Motherboard
{
switch (name)
{
case "Alienware":
case var _ when name.Equals("Alienware", StringComparison.OrdinalIgnoreCase):
return Manufacturer.Alienware;
case "Apple Inc.":
case var _ when name.Equals("Apple Inc.", StringComparison.OrdinalIgnoreCase):
return Manufacturer.Apple;
case "ASRock":
case var _ when name.Equals("ASRock", StringComparison.OrdinalIgnoreCase):
return Manufacturer.ASRock;
case "ASUSTeK Computer INC.":
case "ASUSTeK COMPUTER INC.":
case var _ when name.Equals("ASUSTeK Computer INC.", StringComparison.OrdinalIgnoreCase):
return Manufacturer.ASUS;
case "Dell Inc.":
case var _ when name.Equals("Dell Inc.", StringComparison.OrdinalIgnoreCase):
return Manufacturer.Dell;
case "DFI":
case "DFI Inc.":
case var _ when name.Equals("DFI", StringComparison.OrdinalIgnoreCase):
case var _ when name.Equals("DFI Inc.", StringComparison.OrdinalIgnoreCase):
return Manufacturer.DFI;
case "ECS":
case var _ when name.Equals("ECS", StringComparison.OrdinalIgnoreCase):
return Manufacturer.ECS;
case "EPoX COMPUTER CO., LTD":
case var _ when name.Equals("EPoX COMPUTER CO., LTD", StringComparison.OrdinalIgnoreCase):
return Manufacturer.EPoX;
case "EVGA":
case var _ when name.Equals("EVGA", StringComparison.OrdinalIgnoreCase):
return Manufacturer.EVGA;
case "First International Computer, Inc.":
case var _ when name.Equals("First International Computer, Inc.", StringComparison.OrdinalIgnoreCase):
return Manufacturer.FIC;
case "FUJITSU":
case "FUJITSU SIEMENS":
case var _ when name.Equals("Fujitsu", StringComparison.OrdinalIgnoreCase):
case var _ when name.Equals("Fujitsu Siemens", StringComparison.OrdinalIgnoreCase):
return Manufacturer.Fujitsu;
case "Gigabyte Technology Co., Ltd.":
case var _ when name.Equals("Gigabyte Technology Co., Ltd.", StringComparison.OrdinalIgnoreCase):
return Manufacturer.Gigabyte;
case "Hewlett-Packard":
case var _ when name.Equals("Hewlett-Packard", StringComparison.OrdinalIgnoreCase):
return Manufacturer.HP;
case "IBM":
case var _ when name.Equals("IBM", StringComparison.OrdinalIgnoreCase):
return Manufacturer.IBM;
case "Intel":
case "Intel Corp.":
case "Intel Corporation":
case "INTEL Corporation":
case var _ when name.Equals("Intel", StringComparison.OrdinalIgnoreCase):
case var _ when name.StartsWith("Intel Corp", StringComparison.OrdinalIgnoreCase):
return Manufacturer.Intel;
case "Lenovo":
case "LENOVO":
case var _ when name.Equals("Lenovo", StringComparison.OrdinalIgnoreCase):
return Manufacturer.Lenovo;
case "Micro-Star International":
case "Micro-Star International Co., Ltd":
case "MICRO-STAR INTERNATIONAL CO., LTD":
case "MICRO-STAR INTERNATIONAL CO.,LTD":
case "MSI":
case var _ when name.StartsWith("Micro-Star International", StringComparison.OrdinalIgnoreCase):
case var _ when name.Equals("MSI", StringComparison.OrdinalIgnoreCase):
return Manufacturer.MSI;
case "Shuttle":
case var _ when name.Equals("Shuttle", StringComparison.OrdinalIgnoreCase):
return Manufacturer.Shuttle;
case "Supermicro":
case var _ when name.Equals("Supermicro", StringComparison.OrdinalIgnoreCase):
return Manufacturer.Supermicro;
case "TOSHIBA":
case var _ when name.Equals("Toshiba", StringComparison.OrdinalIgnoreCase):
return Manufacturer.Toshiba;
case "XFX":
case var _ when name.Equals("XFX", StringComparison.OrdinalIgnoreCase):
return Manufacturer.XFX;
case "To be filled by O.E.M.":
case var _ when name.Equals("To be filled by O.E.M.", StringComparison.OrdinalIgnoreCase):
return Manufacturer.Unknown;
default:
return Manufacturer.Unknown;
@@ -75,184 +70,186 @@ namespace LibreHardwareMonitor.Hardware.Motherboard
{
switch (name)
{
case "880GMH/USB3":
case var _ when name.Equals("880GMH/USB3", StringComparison.OrdinalIgnoreCase):
return Model._880GMH_USB3;
case "B85M-DGS":
case var _ when name.Equals("B85M-DGS", StringComparison.OrdinalIgnoreCase):
return Model.B85M_DGS;
case "ASRock AOD790GX/128M":
case var _ when name.Equals("ASRock AOD790GX/128M", StringComparison.OrdinalIgnoreCase):
return Model.AOD790GX_128M;
case "AB350 Pro4":
return Model.AB350_PRO4;
case "AB350M Pro4":
return Model.AB350M_PRO4;
case "AB350M":
case var _ when name.Equals("AB350 Pro4", StringComparison.OrdinalIgnoreCase):
return Model.AB350_Pro4;
case var _ when name.Equals("AB350M Pro4", StringComparison.OrdinalIgnoreCase):
return Model.AB350M_Pro4;
case var _ when name.Equals("AB350M", StringComparison.OrdinalIgnoreCase):
return Model.AB350M;
case "B450 Steel Legend":
return Model.B450_STEEL_LEGEND;
case "B450M Steel Legend":
return Model.B450M_STEEL_LEGEND;
case "B450 Pro4":
return Model.B450_PRO4;
case "B450M Pro4":
return Model.B450M_PRO4;
case "Fatal1ty AB350 Gaming K4":
case var _ when name.Equals("B450 Steel Legend", StringComparison.OrdinalIgnoreCase):
return Model.B450_Steel_Legend;
case var _ when name.Equals("B450M Steel Legend", StringComparison.OrdinalIgnoreCase):
return Model.B450M_Steel_Legend;
case var _ when name.Equals("B450 Pro4", StringComparison.OrdinalIgnoreCase):
return Model.B450_Pro4;
case var _ when name.Equals("B450M Pro4", StringComparison.OrdinalIgnoreCase):
return Model.B450M_Pro4;
case var _ when name.Equals("Fatal1ty AB350 Gaming K4", StringComparison.OrdinalIgnoreCase):
return Model.Fatal1ty_AB350_Gaming_K4;
case "AB350M-HDV":
case var _ when name.Equals("AB350M-HDV", StringComparison.OrdinalIgnoreCase):
return Model.AB350M_HDV;
case "X399 Phantom Gaming 6":
return Model.PHANTOM_GAMING_6;
case "A320M-HDV":
case var _ when name.Equals("X399 Phantom Gaming 6", StringComparison.OrdinalIgnoreCase):
return Model.X399_Phantom_Gaming_6;
case var _ when name.Equals("A320M-HDV", StringComparison.OrdinalIgnoreCase):
return Model.A320M_HDV;
case "P55 Deluxe":
case var _ when name.Equals("P55 Deluxe", StringComparison.OrdinalIgnoreCase):
return Model.P55_Deluxe;
case "Crosshair III Formula":
return Model.Crosshair_III_Formula;
case "M2N-SLI DELUXE":
return Model.M2N_SLI_DELUXE;
case "M4A79XTD EVO":
case var _ when name.Equals("Crosshair III Formula", StringComparison.OrdinalIgnoreCase):
return Model.CROSSHAIR_III_FORMULA;
case var _ when name.Equals("M2N-SLI DELUXE", StringComparison.OrdinalIgnoreCase):
return Model.M2N_SLI_Deluxe;
case var _ when name.Equals("M4A79XTD EVO", StringComparison.OrdinalIgnoreCase):
return Model.M4A79XTD_EVO;
case "P5W DH Deluxe":
case var _ when name.Equals("P5W DH Deluxe", StringComparison.OrdinalIgnoreCase):
return Model.P5W_DH_Deluxe;
case "P6T":
case var _ when name.Equals("P6T", StringComparison.OrdinalIgnoreCase):
return Model.P6T;
case "P6X58D-E":
case var _ when name.Equals("P6X58D-E", StringComparison.OrdinalIgnoreCase):
return Model.P6X58D_E;
case "P8P67":
case "P8P67 REV 3.1":
case var _ when name.Equals("P8P67", StringComparison.OrdinalIgnoreCase):
case var _ when name.Equals("P8P67 REV 3.1", StringComparison.OrdinalIgnoreCase):
return Model.P8P67;
case "P8P67 EVO":
case var _ when name.Equals("P8P67 EVO", StringComparison.OrdinalIgnoreCase):
return Model.P8P67_EVO;
case "P8P67 PRO":
case var _ when name.Equals("P8P67 PRO", StringComparison.OrdinalIgnoreCase):
return Model.P8P67_PRO;
case "P8P67-M PRO":
case var _ when name.Equals("P8P67-M PRO", StringComparison.OrdinalIgnoreCase):
return Model.P8P67_M_PRO;
case "P8Z77-V":
case var _ when name.Equals("P8Z77-V", StringComparison.OrdinalIgnoreCase):
return Model.P8Z77_V;
case "P9X79":
case var _ when name.Equals("P9X79", StringComparison.OrdinalIgnoreCase):
return Model.P9X79;
case "Rampage Extreme":
return Model.Rampage_Extreme;
case "Rampage II GENE":
return Model.Rampage_II_GENE;
case "LP BI P45-T2RS Elite":
case var _ when name.Equals("Rampage Extreme", StringComparison.OrdinalIgnoreCase):
return Model.RAMPAGE_EXTREME;
case var _ when name.Equals("Rampage II GENE", StringComparison.OrdinalIgnoreCase):
return Model.RAMPAGE_II_GENE;
case var _ when name.Equals("LP BI P45-T2RS Elite", StringComparison.OrdinalIgnoreCase):
return Model.LP_BI_P45_T2RS_Elite;
case "LP DK P55-T3eH9":
return Model.LP_DK_P55_T3eH9;
case "A890GXM-A":
case var _ when name.Equals("LP DK P55-T3eH9", StringComparison.OrdinalIgnoreCase):
return Model.LP_DK_P55_T3EH9;
case var _ when name.Equals("A890GXM-A", StringComparison.OrdinalIgnoreCase):
return Model.A890GXM_A;
case "X58 SLI Classified":
case var _ when name.Equals("X58 SLI Classified", StringComparison.OrdinalIgnoreCase):
return Model.X58_SLI_Classified;
case "965P-S3":
case var _ when name.Equals("965P-S3", StringComparison.OrdinalIgnoreCase):
return Model._965P_S3;
case "EP45-DS3R":
case var _ when name.Equals("EP45-DS3R", StringComparison.OrdinalIgnoreCase):
return Model.EP45_DS3R;
case "EP45-UD3R":
case var _ when name.Equals("EP45-UD3R", StringComparison.OrdinalIgnoreCase):
return Model.EP45_UD3R;
case "EX58-EXTREME":
case var _ when name.Equals("EX58-EXTREME", StringComparison.OrdinalIgnoreCase):
return Model.EX58_EXTREME;
case "EX58-UD3R":
case var _ when name.Equals("EX58-UD3R", StringComparison.OrdinalIgnoreCase):
return Model.EX58_UD3R;
case "G41M-Combo":
return Model.G41M_Combo;
case "G41MT-S2":
case var _ when name.Equals("G41M-Combo", StringComparison.OrdinalIgnoreCase):
return Model.G41M_COMBO;
case var _ when name.Equals("G41MT-S2", StringComparison.OrdinalIgnoreCase):
return Model.G41MT_S2;
case "G41MT-S2P":
case var _ when name.Equals("G41MT-S2P", StringComparison.OrdinalIgnoreCase):
return Model.G41MT_S2P;
case "GA-970A-UD3":
case var _ when name.Equals("GA-970A-UD3", StringComparison.OrdinalIgnoreCase):
return Model._970A_UD3;
case "GA-MA770T-UD3":
case var _ when name.Equals("GA-MA770T-UD3", StringComparison.OrdinalIgnoreCase):
return Model.MA770T_UD3;
case "GA-MA770T-UD3P":
case var _ when name.Equals("GA-MA770T-UD3P", StringComparison.OrdinalIgnoreCase):
return Model.MA770T_UD3P;
case "GA-MA785GM-US2H":
case var _ when name.Equals("GA-MA785GM-US2H", StringComparison.OrdinalIgnoreCase):
return Model.MA785GM_US2H;
case "GA-MA785GMT-UD2H":
case var _ when name.Equals("GA-MA785GMT-UD2H", StringComparison.OrdinalIgnoreCase):
return Model.MA785GMT_UD2H;
case "GA-MA78LM-S2H":
case var _ when name.Equals("GA-MA78LM-S2H", StringComparison.OrdinalIgnoreCase):
return Model.MA78LM_S2H;
case "GA-MA790X-UD3P":
case var _ when name.Equals("GA-MA790X-UD3P", StringComparison.OrdinalIgnoreCase):
return Model.MA790X_UD3P;
case "H55-USB3":
case var _ when name.Equals("H55-USB3", StringComparison.OrdinalIgnoreCase):
return Model.H55_USB3;
case "H55N-USB3":
case var _ when name.Equals("H55N-USB3", StringComparison.OrdinalIgnoreCase):
return Model.H55N_USB3;
case "H61M-DS2 REV 1.2":
case var _ when name.Equals("H61M-DS2 REV 1.2", StringComparison.OrdinalIgnoreCase):
return Model.H61M_DS2_REV_1_2;
case "H61M-USB3-B3 REV 2.0":
case var _ when name.Equals("H61M-USB3-B3 REV 2.0", StringComparison.OrdinalIgnoreCase):
return Model.H61M_USB3_B3_REV_2_0;
case "H67A-UD3H-B3":
case var _ when name.Equals("H67A-UD3H-B3", StringComparison.OrdinalIgnoreCase):
return Model.H67A_UD3H_B3;
case "H67A-USB3-B3":
case var _ when name.Equals("H67A-USB3-B3", StringComparison.OrdinalIgnoreCase):
return Model.H67A_USB3_B3;
case "P35-DS3":
case var _ when name.Equals("P35-DS3", StringComparison.OrdinalIgnoreCase):
return Model.P35_DS3;
case "P35-DS3L":
case var _ when name.Equals("P35-DS3L", StringComparison.OrdinalIgnoreCase):
return Model.P35_DS3L;
case "P55-UD4":
case var _ when name.Equals("P55-UD4", StringComparison.OrdinalIgnoreCase):
return Model.P55_UD4;
case "P55A-UD3":
case var _ when name.Equals("P55A-UD3", StringComparison.OrdinalIgnoreCase):
return Model.P55A_UD3;
case "P55M-UD4":
case var _ when name.Equals("P55M-UD4", StringComparison.OrdinalIgnoreCase):
return Model.P55M_UD4;
case "P67A-UD3-B3":
case var _ when name.Equals("P67A-UD3-B3", StringComparison.OrdinalIgnoreCase):
return Model.P67A_UD3_B3;
case "P67A-UD3R-B3":
case var _ when name.Equals("P67A-UD3R-B3", StringComparison.OrdinalIgnoreCase):
return Model.P67A_UD3R_B3;
case "P67A-UD4-B3":
case var _ when name.Equals("P67A-UD4-B3", StringComparison.OrdinalIgnoreCase):
return Model.P67A_UD4_B3;
case "P8Z68-V PRO":
case var _ when name.Equals("P8Z68-V PRO", StringComparison.OrdinalIgnoreCase):
return Model.P8Z68_V_PRO;
case "X38-DS5":
case var _ when name.Equals("X38-DS5", StringComparison.OrdinalIgnoreCase):
return Model.X38_DS5;
case "X58A-UD3R":
case var _ when name.Equals("X58A-UD3R", StringComparison.OrdinalIgnoreCase):
return Model.X58A_UD3R;
case "Z270 PC MATE":
case "Z270 PC MATE (MS-7A72)":
case var _ when name.Equals("Z270 PC MATE", StringComparison.OrdinalIgnoreCase):
case var _ when name.Equals("Z270 PC MATE (MS-7A72)", StringComparison.OrdinalIgnoreCase):
return Model.Z270_PC_MATE;
case "X79-UD3":
case var _ when name.Equals("X79-UD3", StringComparison.OrdinalIgnoreCase):
return Model.X79_UD3;
case "Z68A-D3H-B3":
case var _ when name.Equals("Z68A-D3H-B3", StringComparison.OrdinalIgnoreCase):
return Model.Z68A_D3H_B3;
case "Z68AP-D3":
case var _ when name.Equals("Z68AP-D3", StringComparison.OrdinalIgnoreCase):
return Model.Z68AP_D3;
case "Z68X-UD3H-B3":
case var _ when name.Equals("Z68X-UD3H-B3", StringComparison.OrdinalIgnoreCase):
return Model.Z68X_UD3H_B3;
case "Z68X-UD7-B3":
case var _ when name.Equals("Z68X-UD7-B3", StringComparison.OrdinalIgnoreCase):
return Model.Z68X_UD7_B3;
case "Z390 M GAMING-CF":
case var _ when name.Equals("Z390 M GAMING-CF", StringComparison.OrdinalIgnoreCase):
return Model.Z390_M_GAMING;
case "Z390 AORUS ULTRA":
case var _ when name.Equals("Z390 AORUS ULTRA", StringComparison.OrdinalIgnoreCase):
return Model.Z390_AORUS_ULTRA;
case "Z390 UD":
case var _ when name.Equals("Z390 UD", StringComparison.OrdinalIgnoreCase):
return Model.Z390_UD;
case "FH67":
case var _ when name.Equals("FH67", StringComparison.OrdinalIgnoreCase):
return Model.FH67;
case "AX370-Gaming K7":
return Model.AX370_K7;
case "PRIME X370-PRO":
case var _ when name.Equals("AX370-Gaming K7", StringComparison.OrdinalIgnoreCase):
return Model.AX370_Gaming_K7;
case var _ when name.Equals("PRIME X370-PRO", StringComparison.OrdinalIgnoreCase):
return Model.PRIME_X370_PRO;
case "ROG MAXIMUS X APEX":
return Model.ROG_MAXIMUS_APEX;
case "AB350-Gaming 3-CF":
return Model.AB350_Gaming_3_CF;
case "X399 AORUS Gaming 7":
return Model.X399_AOURUS_GAMING7;
case "ROG ZENITH EXTREME":
case var _ when name.Equals("ROG MAXIMUS X APEX", StringComparison.OrdinalIgnoreCase):
return Model.ROG_MAXIMUS_X_APEX;
case var _ when name.Equals("AB350-Gaming 3-CF", StringComparison.OrdinalIgnoreCase):
return Model.AB350_Gaming_3;
case var _ when name.Equals("X399 AORUS Gaming 7", StringComparison.OrdinalIgnoreCase):
return Model.X399_AORUS_Gaming_7;
case var _ when name.Equals("ROG ZENITH EXTREME", StringComparison.OrdinalIgnoreCase):
return Model.ROG_ZENITH_EXTREME;
case "Z170-A":
case var _ when name.Equals("Z170-A", StringComparison.OrdinalIgnoreCase):
return Model.Z170_A;
case "Z77 Pro4-M":
return Model.Z77PRO4M;
case "AX370-Gaming 5":
case var _ when name.Equals("Z77 Pro4-M", StringComparison.OrdinalIgnoreCase):
return Model.Z77Pro4M;
case var _ when name.Equals("AX370-Gaming 5", StringComparison.OrdinalIgnoreCase):
return Model.AX370_Gaming_5;
case "TUF X470-PLUS GAMING":
case var _ when name.Equals("TUF X470-PLUS GAMING", StringComparison.OrdinalIgnoreCase):
return Model.TUF_X470_PLUS_GAMING;
case "B360M PRO-VDH (MS-7B24)":
case var _ when name.Equals("B360M PRO-VDH (MS-7B24)", StringComparison.OrdinalIgnoreCase):
return Model.B360M_PRO_VDH;
case "B450-A PRO (MS-7B86)":
case var _ when name.Equals("B450-A PRO (MS-7B86)", StringComparison.OrdinalIgnoreCase):
return Model.B450A_PRO;
case "Base Board Product Name":
case "To be filled by O.E.M.":
case var _ when name.Equals("B350 GAMING PLUS (MS-7A34)", StringComparison.OrdinalIgnoreCase):
return Model.B350_Gaming_Plus;
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;
default:
return Model.Unknown;
@@ -15,80 +15,84 @@ namespace LibreHardwareMonitor.Hardware.Motherboard
{
// ASRock
_880GMH_USB3,
AOD790GX_128M,
P55_Deluxe,
B85M_DGS,
Z77PRO4M,
AB350M_PRO4,
AB350_PRO4,
AB350M,
Fatal1ty_AB350_Gaming_K4,
AB350M_HDV,
PHANTOM_GAMING_6,
A320M_HDV,
B450_STEEL_LEGEND,
B450M_STEEL_LEGEND,
B450_PRO4,
B450M_PRO4,
AB350_Pro4,
AB350M,
AB350M_HDV,
AB350M_Pro4,
AOD790GX_128M,
B450_Pro4,
B450_Steel_Legend,
B450M_Pro4,
B450M_Steel_Legend,
B85M_DGS,
Fatal1ty_AB350_Gaming_K4,
P55_Deluxe,
X399_Phantom_Gaming_6,
Z77Pro4M,
// ASUS
Crosshair_III_Formula,
M2N_SLI_DELUXE,
CROSSHAIR_III_FORMULA,
M2N_SLI_Deluxe,
M4A79XTD_EVO,
P5W_DH_Deluxe,
P6T,
P6X58D_E,
P8P67,
P8P67_EVO,
P8P67_PRO,
P8P67_M_PRO,
P8P67_PRO,
P8Z77_V,
P9X79,
Rampage_Extreme,
Rampage_II_GENE,
PRIME_X370_PRO,
ROG_MAXIMUS_APEX,
RAMPAGE_EXTREME,
RAMPAGE_II_GENE,
ROG_MAXIMUS_X_APEX,
ROG_ZENITH_EXTREME,
Z170_A,
TUF_X470_PLUS_GAMING,
Z170_A,
// DFI
LP_BI_P45_T2RS_Elite,
LP_DK_P55_T3eH9,
LP_DK_P55_T3EH9,
// ECS
A890GXM_A,
// MSI
Z270_PC_MATE,
B350_Gaming_Plus,
B360M_PRO_VDH,
B450A_PRO,
Z270_PC_MATE,
// EVGA
X58_SLI_Classified,
// Gigabyte
_965P_S3,
_970A_UD3,
AB350_Gaming_3,
AX370_Gaming_5,
AX370_Gaming_K7,
EP45_DS3R,
EP45_UD3R,
EX58_EXTREME,
EX58_UD3R,
G41M_Combo,
G41M_COMBO,
G41MT_S2,
G41MT_S2P,
_970A_UD3,
MA770T_UD3,
MA770T_UD3P,
MA785GM_US2H,
MA785GMT_UD2H,
MA78LM_S2H,
MA790X_UD3P,
H55_USB3,
H55N_USB3,
H61M_DS2_REV_1_2,
H61M_USB3_B3_REV_2_0,
H67A_UD3H_B3,
H67A_USB3_B3,
MA770T_UD3,
MA770T_UD3P,
MA785GM_US2H,
MA785GMT_UD2H,
MA78LM_S2H,
MA790X_UD3P,
P35_DS3,
P35_DS3L,
P55_UD4,
@@ -99,19 +103,16 @@ namespace LibreHardwareMonitor.Hardware.Motherboard
P67A_UD4_B3,
P8Z68_V_PRO,
X38_DS5,
X399_AORUS_Gaming_7,
X58A_UD3R,
X79_UD3,
Z390_AORUS_ULTRA,
Z390_M_GAMING,
Z390_UD,
Z68A_D3H_B3,
Z68AP_D3,
Z68X_UD3H_B3,
Z68X_UD7_B3,
AX370_K7,
Z390_M_GAMING,
Z390_AORUS_ULTRA,
Z390_UD,
AB350_Gaming_3_CF,
X399_AOURUS_GAMING7,
AX370_Gaming_5,
// Shuttle
FH67,
@@ -345,14 +345,14 @@ namespace LibreHardwareMonitor.Hardware.Motherboard
case Manufacturer.ASUS:
switch (model)
{
case Model.Crosshair_III_Formula: // IT8720F
case Model.CROSSHAIR_III_FORMULA: // IT8720F
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));
break;
case Model.M2N_SLI_DELUXE:
case Model.M2N_SLI_Deluxe:
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("+3.3V", 1));
v.Add(new Voltage("+5V", 3, 6.8f, 10));
@@ -506,7 +506,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard
f.Add(new Fan("Fan #2", 1));
f.Add(new Fan("Fan #3", 2));
break;
case Model.LP_DK_P55_T3eH9: // IT8720F
case Model.LP_DK_P55_T3EH9: // IT8720F
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("VTT", 1));
v.Add(new Voltage("+3.3V", 2));
@@ -636,7 +636,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard
f.Add(new Fan("CPU Fan", 0));
f.Add(new Fan("System Fan", 1));
break;
case Model.G41M_Combo: // IT8718F
case Model.G41M_COMBO: // IT8718F
case Model.G41MT_S2: // IT8718F
case Model.G41MT_S2P: // IT8718F
v.Add(new Voltage("Vcore", 0));
@@ -726,9 +726,9 @@ namespace LibreHardwareMonitor.Hardware.Motherboard
f.Add(new Fan("Power Fan", 2));
f.Add(new Fan("System Fan #1", 3));
break;
case Model.AX370_K7: // IT8686E
case Model.AX370_Gaming_K7: // IT8686E
case Model.AX370_Gaming_5:
case Model.AB350_Gaming_3_CF: // IT8686E
case Model.AB350_Gaming_3: // IT8686E
// Note: v3.3, v12, v5, and AVCC3 might be slightly off.
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("+3.3V", 1, 0.65f, 1));
@@ -774,7 +774,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard
f.Add(new Fan("System Fan #2", 2));
f.Add(new Fan("System Fan #3", 3));
break;
case Model.X399_AOURUS_GAMING7: //ITE IT8686E
case Model.X399_AORUS_Gaming_7: //ITE IT8686E
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));
@@ -1356,7 +1356,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard
}
break;
case Model.Z77PRO4M: //NCT6776F
case Model.Z77Pro4M: //NCT6776F
v.Add(new Voltage("Vcore", 0, 0, 1));
v.Add(new Voltage("+12V", 1, 56, 10));
v.Add(new Voltage("AVCC", 2, 10, 10));
@@ -1467,15 +1467,15 @@ namespace LibreHardwareMonitor.Hardware.Motherboard
break;
case Model.AB350_PRO4: //NCT6779D
case Model.AB350M_PRO4:
case Model.AB350_Pro4: //NCT6779D
case Model.AB350M_Pro4:
case Model.AB350M:
case Model.Fatal1ty_AB350_Gaming_K4:
case Model.AB350M_HDV:
case Model.B450_STEEL_LEGEND:
case Model.B450M_STEEL_LEGEND:
case Model.B450_PRO4:
case Model.B450M_PRO4:
case Model.B450_Steel_Legend:
case Model.B450M_Steel_Legend:
case Model.B450_Pro4:
case Model.B450M_Pro4:
v.Add(new Voltage("Vcore", 0, 10, 10));
//v.Add(new Voltage("#Unused", 1, 0, 1, 0, true));
v.Add(new Voltage("AVCC", 2, 10, 10));
@@ -1508,7 +1508,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard
break;
case Model.PHANTOM_GAMING_6: //NCT6779D
case Model.X399_Phantom_Gaming_6: //NCT6779D
v.Add(new Voltage("Vcore", 0, 10, 10));
v.Add(new Voltage("Chipset 1.05V", 1, 0, 1));
v.Add(new Voltage("AVCC", 2, 10, 10));
@@ -1604,7 +1604,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard
c.Add(new Ctrl("Chassis Fan #2", 2));
c.Add(new Ctrl("Chassis Fan #3", 3));
break;
case Model.ROG_MAXIMUS_APEX: // NCT6793D
case Model.ROG_MAXIMUS_X_APEX: // NCT6793D
v.Add(new Voltage("Vcore", 0, 2, 2));
v.Add(new Voltage("+5V", 1, 4, 1));
v.Add(new Voltage("AVSB", 2, 34, 34));
@@ -1975,7 +1975,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard
{
case Model.P6T: // W83667HG
case Model.P6X58D_E: // W83667HG
case Model.Rampage_II_GENE: // W83667HG
case Model.RAMPAGE_II_GENE: // W83667HG
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("+12V", 1, 11.5f, 1.91f));
v.Add(new Voltage("Analog +3.3V", 2, 34, 34));
@@ -1991,7 +1991,7 @@ namespace LibreHardwareMonitor.Hardware.Motherboard
f.Add(new Fan("Chassis Fan #2", 3));
f.Add(new Fan("Chassis Fan #3", 4));
break;
case Model.Rampage_Extreme: // W83667HG
case Model.RAMPAGE_EXTREME: // W83667HG
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("+12V", 1, 12, 2));
v.Add(new Voltage("Analog +3.3V", 2, 34, 34));