JMR-dev/ReLibreHardwareMonitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Add MSI B450-A Pro

Browse Source
This commit is contained in:
Phyxion
2019-08-29 15:22:02 +02:00
parent e22a7cba64
commit 5b476a881e
4 changed files with 195 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Hardware/Mainboard/Identification.cs
+19 -19
View File
@@ -82,20 +82,19 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case "ASRock AOD790GX/128M":
return Model.AOD790GX_128M;
case "AB350 Pro4":
return Model.ASROCK_AB350_PRO4;
return Model.AB350_PRO4;
case "AB350M Pro4":
return Model.ASROCK_AB350M_PRO4;
return Model.AB350M_PRO4;
case "AB350M":
return Model.ASROCK_AB350M;
return Model.AB350M;
case "Fatal1ty AB350 Gaming K4":
return Model.ASROCK_Fatal1ty_AB350_Gaming_K4;
return Model.Fatal1ty_AB350_Gaming_K4;
case "AB350M-HDV":
return Model.ASROCK_AB350M_HDV;
return Model.AB350M_HDV;
case "X399 Phantom Gaming 6":
return Model.ASROCK_PHANTOM_GAMING_6;
return Model.PHANTOM_GAMING_6;
case "A320M-HDV":
return Model.ASROCK_A320M_HDV;
return Model.A320M_HDV;
case "P55 Deluxe":
return Model.P55_Deluxe;
case "Crosshair III Formula":
@@ -152,19 +151,19 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case "G41MT-S2P":
return Model.G41MT_S2P;
case "GA-970A-UD3":
return Model.GA_970A_UD3;
return Model._970A_UD3;
case "GA-MA770T-UD3":
return Model.GA_MA770T_UD3;
return Model.MA770T_UD3;
case "GA-MA770T-UD3P":
return Model.GA_MA770T_UD3P;
return Model.MA770T_UD3P;
case "GA-MA785GM-US2H":
return Model.GA_MA785GM_US2H;
return Model.MA785GM_US2H;
case "GA-MA785GMT-UD2H":
return Model.GA_MA785GMT_UD2H;
return Model.MA785GMT_UD2H;
case "GA-MA78LM-S2H":
return Model.GA_MA78LM_S2H;
return Model.MA78LM_S2H;
case "GA-MA790X-UD3P":
return Model.GA_MA790X_UD3P;
return Model.MA790X_UD3P;
case "H55-USB3":
return Model.H55_USB3;
case "H55N-USB3":
@@ -229,20 +228,21 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case "AB350-Gaming 3-CF":
return Model.AB350_Gaming_3_CF;
case "X399 AORUS Gaming 7":
return Model.GIGABYTE_X399_AOURUS_GAMING7;
return Model.X399_AOURUS_GAMING7;
case "ROG ZENITH EXTREME":
return Model.ROG_ZENITH_EXTREME;
case "Z170-A":
return Model.ASUS_Z170_A;
return Model.Z170_A;
case "Z77 Pro4-M":
return Model.ASROCK_Z77PRO4M;
return Model.Z77PRO4M;
case "AX370-Gaming 5":
return Model.AX370_Gaming_5;
case "TUF X470-PLUS GAMING":
return Model.TUF_X470_PLUS_GAMING;
case "B360M PRO-VDH (MS-7B24)":
return Model.B360M_PRO_VDH;
case "B450-A PRO (MS-7B86)":
return Model.B450A_PRO;
case "Base Board Product Name":
case "To be filled by O.E.M.":
return Model.Unknown;
Hardware/Mainboard/Model.cs
+20 -17
View File
@@ -8,6 +8,8 @@
*/
// ReSharper disable InconsistentNaming
namespace OpenHardwareMonitor.Hardware.Mainboard {
internal enum Model {
@@ -16,14 +18,14 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
AOD790GX_128M,
P55_Deluxe,
B85M_DGS,
ASROCK_Z77PRO4M,
ASROCK_AB350M_PRO4,
ASROCK_AB350_PRO4,
ASROCK_AB350M,
ASROCK_Fatal1ty_AB350_Gaming_K4,
ASROCK_AB350M_HDV,
ASROCK_PHANTOM_GAMING_6,
ASROCK_A320M_HDV,
Z77PRO4M,
AB350M_PRO4,
AB350_PRO4,
AB350M,
Fatal1ty_AB350_Gaming_K4,
AB350M_HDV,
PHANTOM_GAMING_6,
A320M_HDV,
// ASUS
Crosshair_III_Formula,
@@ -43,7 +45,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
PRIME_X370_PRO,
ROG_MAXIMUS_APEX,
ROG_ZENITH_EXTREME,
ASUS_Z170_A,
Z170_A,
TUF_X470_PLUS_GAMING,
// DFI
@@ -56,6 +58,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
// MSI
Z270_PC_MATE,
B360M_PRO_VDH,
B450A_PRO,
// EVGA
X58_SLI_Classified,
@@ -69,13 +72,13 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
G41M_Combo,
G41MT_S2,
G41MT_S2P,
GA_970A_UD3,
GA_MA770T_UD3,
GA_MA770T_UD3P,
GA_MA785GM_US2H,
GA_MA785GMT_UD2H,
GA_MA78LM_S2H,
GA_MA790X_UD3P,
_970A_UD3,
MA770T_UD3,
MA770T_UD3P,
MA785GM_US2H,
MA785GMT_UD2H,
MA78LM_S2H,
MA790X_UD3P,
H55_USB3,
H55N_USB3,
H61M_DS2_REV_1_2,
@@ -103,7 +106,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
Z390_AORUS_ULTRA,
Z390_UD,
AB350_Gaming_3_CF,
GIGABYTE_X399_AOURUS_GAMING7,
X399_AOURUS_GAMING7,
AX370_Gaming_5,
// Shuttle
Hardware/Mainboard/SuperIOHardware.cs
+155 -125
View File
@@ -37,7 +37,6 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
private readonly UpdateDelegate postUpdate;
// mainboard specific mutex
private readonly Mutex mutex;
public SuperIOHardware(Mainboard mainboard, ISuperIO superIO,
Manufacturer manufacturer, Model model, ISettings settings)
@@ -54,7 +53,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
GetBoardSpecificConfiguration(superIO, manufacturer, model,
out v, out t, out f, out c,
out readVoltage, out readTemperature, out readFan, out readControl,
out postUpdate, out mutex);
out postUpdate, out _);
CreateVoltageSensors(superIO, settings, v);
CreateTemperatureSensors(superIO, settings, t);
@@ -99,8 +98,6 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case ControlMode.Software:
superIO.SetControl(index, (byte)(control.SoftwareValue * 2.55));
break;
default:
break;
}
sensor.Control = control;
@@ -230,7 +227,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case Chip.W83627HF:
case Chip.W83627THF:
case Chip.W83687THF:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("Voltage #2", 1, true));
v.Add(new Voltage("Voltage #3", 2, true));
v.Add(new Voltage("AVCC", 3, 34, 51));
@@ -249,7 +246,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
GetNuvotonConfigurationF(superIO, manufacturer, model, v, t, f, c);
break;
case Chip.NCT610X:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("Voltage #0", 1, true));
v.Add(new Voltage("AVCC", 2, 34, 34));
v.Add(new Voltage("3VCC", 3, 34, 34));
@@ -312,7 +309,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
f.Add(new Fan("Fan #" + (i + 1), i));
break;
case Model.M2N_SLI_DELUXE:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("+3.3V", 1));
v.Add(new Voltage("+5V", 3, 6.8f, 10));
v.Add(new Voltage("+12V", 4, 30, 10));
@@ -335,7 +332,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
break;
case Model.PRIME_X370_PRO: // IT8665E
case Model.TUF_X470_PLUS_GAMING:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("SB 2.5V", 1));
v.Add(new Voltage("+12V", 2, 5, 1));
v.Add(new Voltage("+5V", 3, 1.5f, 1));
@@ -356,12 +353,12 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
break;
case Model.ROG_ZENITH_EXTREME: // IT8665E
v.Add(new Voltage("CPU VCore", 0, 10, 10, 0, false));
v.Add(new Voltage("DRAM AB", 1, 10, 10, 0, false));
v.Add(new Voltage("Vcore", 0, 10, 10, 0, false));
v.Add(new Voltage("DIMM AB", 1, 10, 10, 0, false));
v.Add(new Voltage("+12V", 2, 5, 1,0, false));
v.Add(new Voltage("+5V", 3, 1.5f, 1, 0, false));
v.Add(new Voltage("SB 1.05V", 4, 10, 10, 0, false));
v.Add(new Voltage("DRAM CD", 5, 10, 10, 0, false));
v.Add(new Voltage("DIMM CD", 5, 10, 10, 0, false));
v.Add(new Voltage("1.8V PLL", 6, 10, 10, 0, false));
v.Add(new Voltage("+3.3V", 7, 10, 10, 0, false));
v.Add(new Voltage("VBat", 8, 10, 10, 0, false));
@@ -386,7 +383,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
break;
default:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("Voltage #2", 1, true));
v.Add(new Voltage("Voltage #3", 2, true));
v.Add(new Voltage("Voltage #4", 3, true));
@@ -412,7 +409,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
ref readFan, ref postUpdate, ref mutex);
break;
default:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("Voltage #2", 1, true));
v.Add(new Voltage("Voltage #3", 2, true));
v.Add(new Voltage("Voltage #4", 3, true));
@@ -432,7 +429,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case Manufacturer.DFI:
switch (model) {
case Model.LP_BI_P45_T2RS_Elite: // IT8718F
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("FSB VTT", 1));
v.Add(new Voltage("+3.3V", 2));
v.Add(new Voltage("+5V", 3, 6.8f, 10));
@@ -449,13 +446,13 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
f.Add(new Fan("Fan #3", 2));
break;
case Model.LP_DK_P55_T3eH9: // IT8720F
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("VTT", 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("DRAM", 6));
v.Add(new Voltage("DIMM", 6));
v.Add(new Voltage("+5VSB", 7, 6.8f, 10));
v.Add(new Voltage("VBat", 8));
t.Add(new Temperature("Chipset", 0));
@@ -466,13 +463,13 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
f.Add(new Fan("Fan #3", 2));
break;
default:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("VTT", 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));
v.Add(new Voltage("Voltage #6", 5, true));
v.Add(new Voltage("DRAM", 6, true));
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++)
@@ -488,8 +485,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case Manufacturer.Gigabyte:
switch (model) {
case Model._965P_S3: // IT8718F
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("DRAM", 1));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("DIMM", 1));
v.Add(new Voltage("+3.3V", 2));
v.Add(new Voltage("+5V", 3, 6.8f, 10));
v.Add(new Voltage("+12V", 7, 24.3f, 8.2f));
@@ -502,8 +499,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case Model.EP45_DS3R: // IT8718F
case Model.EP45_UD3R:
case Model.X38_DS5:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("DRAM", 1));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("DIMM", 1));
v.Add(new Voltage("+3.3V", 2));
v.Add(new Voltage("+5V", 3, 6.8f, 10));
v.Add(new Voltage("+12V", 7, 24.3f, 8.2f));
@@ -516,8 +513,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
f.Add(new Fan("System Fan #1", 3));
break;
case Model.EX58_EXTREME: // IT8720F
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("DRAM", 1));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("DIMM", 1));
v.Add(new Voltage("+5V", 3, 6.8f, 10));
v.Add(new Voltage("VBat", 8));
t.Add(new Temperature("System", 0));
@@ -530,8 +527,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
break;
case Model.P35_DS3: // IT8718F
case Model.P35_DS3L: // IT8718F
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("DRAM", 1));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("DIMM", 1));
v.Add(new Voltage("+3.3V", 2));
v.Add(new Voltage("+5V", 3, 6.8f, 10));
v.Add(new Voltage("+12V", 7, 24.3f, 8.2f));
@@ -548,8 +545,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case Model.P55M_UD4: // IT8720F
case Model.H55_USB3: // IT8720F
case Model.EX58_UD3R: // IT8720F
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("DRAM", 1));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("DIMM", 1));
v.Add(new Voltage("+3.3V", 2));
v.Add(new Voltage("+5V", 3, 6.8f, 10));
v.Add(new Voltage("+12V", 5, 24.3f, 8.2f));
@@ -562,8 +559,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
f.Add(new Fan("System Fan #1", 3));
break;
case Model.H55N_USB3: // IT8720F
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("DRAM", 1));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("DIMM", 1));
v.Add(new Voltage("+3.3V", 2));
v.Add(new Voltage("+5V", 3, 6.8f, 10));
v.Add(new Voltage("+12V", 5, 24.3f, 8.2f));
@@ -576,8 +573,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case Model.G41M_Combo: // IT8718F
case Model.G41MT_S2: // IT8718F
case Model.G41MT_S2P: // IT8718F
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("DRAM", 1));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("DIMM", 1));
v.Add(new Voltage("+3.3V", 2));
v.Add(new Voltage("+5V", 3, 6.8f, 10));
v.Add(new Voltage("+12V", 7, 24.3f, 8.2f));
@@ -586,9 +583,9 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
f.Add(new Fan("CPU Fan", 0));
f.Add(new Fan("System Fan", 1));
break;
case Model.GA_970A_UD3: // IT8720F
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("DRAM", 1));
case Model._970A_UD3: // IT8720F
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("DIMM", 1));
v.Add(new Voltage("+3.3V", 2));
v.Add(new Voltage("+5V", 3, 6.8f, 10));
v.Add(new Voltage("+12V", 4, 24.3f, 8.2f));
@@ -603,11 +600,11 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
c.Add(new Ctrl("PWM 2", 1));
c.Add(new Ctrl("PWM 3", 2));
break;
case Model.GA_MA770T_UD3: // IT8720F
case Model.GA_MA770T_UD3P: // IT8720F
case Model.GA_MA790X_UD3P: // IT8720F
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("DRAM", 1));
case Model.MA770T_UD3: // IT8720F
case Model.MA770T_UD3P: // IT8720F
case Model.MA790X_UD3P: // IT8720F
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("DIMM", 1));
v.Add(new Voltage("+3.3V", 2));
v.Add(new Voltage("+5V", 3, 6.8f, 10));
v.Add(new Voltage("+12V", 4, 24.3f, 8.2f));
@@ -619,9 +616,9 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
f.Add(new Fan("System Fan #2", 2));
f.Add(new Fan("Power Fan", 3));
break;
case Model.GA_MA78LM_S2H: // IT8718F
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("DRAM", 1));
case Model.MA78LM_S2H: // IT8718F
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("DIMM", 1));
v.Add(new Voltage("+3.3V", 2));
v.Add(new Voltage("+5V", 3, 6.8f, 10));
v.Add(new Voltage("+12V", 4, 24.3f, 8.2f));
@@ -634,10 +631,10 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
f.Add(new Fan("System Fan #2", 2));
f.Add(new Fan("Power Fan", 3));
break;
case Model.GA_MA785GM_US2H: // IT8718F
case Model.GA_MA785GMT_UD2H: // IT8718F
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("DRAM", 1));
case Model.MA785GM_US2H: // IT8718F
case Model.MA785GMT_UD2H: // IT8718F
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("DIMM", 1));
v.Add(new Voltage("+3.3V", 2));
v.Add(new Voltage("+5V", 3, 6.8f, 10));
v.Add(new Voltage("+12V", 4, 24.3f, 8.2f));
@@ -649,8 +646,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
f.Add(new Fan("NB Fan", 2));
break;
case Model.X58A_UD3R: // IT8720F
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("DRAM", 1));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("DIMM", 1));
v.Add(new Voltage("+3.3V", 2));
v.Add(new Voltage("+5V", 3, 6.8f, 10));
v.Add(new Voltage("+12V", 5, 24.3f, 8.2f));
@@ -667,7 +664,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case Model.AX370_Gaming_5:
case Model.AB350_Gaming_3_CF: // IT8686E
// Note: v3.3, v12, v5, and AVCC3 might be slightly off.
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("+3.3V", 1, 0.65f, 1));
v.Add(new Voltage("+12V", 2, 5, 1));
v.Add(new Voltage("+5V", 3, 1.5f, 1));
@@ -688,7 +685,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case Model.Z390_M_GAMING: // IT8688E
case Model.Z390_AORUS_ULTRA:
case Model.Z390_UD:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("+3.3V", 1, 6.49f, 10));
v.Add(new Voltage("+12V", 2, 5f, 1));
v.Add(new Voltage("+5V", 3, 1.5f, 1));
@@ -710,14 +707,14 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
f.Add(new Fan("System Fan #2", 2));
f.Add(new Fan("System Fan #3", 3));
break;
case Model.GIGABYTE_X399_AOURUS_GAMING7: //ITE IT8686E
v.Add(new Voltage("CPU VCore", 0, 0, 1, 0, false));
case Model.X399_AOURUS_GAMING7: //ITE IT8686E
v.Add(new Voltage("Vcore", 0, 0, 1, 0, false));
v.Add(new Voltage("+3.3V", 1, 6.5F, 10, 0, false));
v.Add(new Voltage("+12V", 2, 5, 1, 0, false));
v.Add(new Voltage("+5V", 3, 1.5F, 1, 0, false));
v.Add(new Voltage("DRAM CD", 4, 0, 1, 0, false));
v.Add(new Voltage("DIMM CD", 4, 0, 1, 0, false));
v.Add(new Voltage("SOC Vcore", 5, 0, 1, 0, false));
v.Add(new Voltage("DRAM AB", 6, 0, 1, 0, false));
v.Add(new Voltage("DIMM AB", 6, 0, 1, 0, false));
v.Add(new Voltage("3VSB", 7, 10, 10, 0, false));
v.Add(new Voltage("VBat", 8, 10, 10, 0, false));
v.Add(new Voltage("AVCC3", 9, 54, 10, 0, false));
@@ -735,8 +732,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
break;
default:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("DRAM", 1, true));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("DIMM", 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("Voltage #5", 4, true));
@@ -755,7 +752,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
break;
default:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("Voltage #2", 1, true));
v.Add(new Voltage("Voltage #3", 2, true));
v.Add(new Voltage("Voltage #4", 3, true));
@@ -779,7 +776,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
ref ReadValueDelegate readFan, ref UpdateDelegate postUpdate,
ref Mutex mutex)
{
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("+3.3V", 2));
v.Add(new Voltage("+12V", 4, 30, 10));
v.Add(new Voltage("+5V", 5, 6.8f, 10));
@@ -845,7 +842,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case Manufacturer.ECS:
switch (model) {
case Model.A890GXM_A: // IT8721F
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("VDIMM", 1));
v.Add(new Voltage("NB Voltage", 2));
v.Add(new Voltage("Analog +3.3V", 3, 10, 10));
@@ -884,8 +881,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case Model.H61M_USB3_B3_REV_2_0: // IT8728F
v.Add(new Voltage("VTT", 0));
v.Add(new Voltage("+12V", 2, 30.9f, 10));
v.Add(new Voltage("CPU VCore", 5));
v.Add(new Voltage("DRAM", 6));
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("VBat", 8, 10, 10));
t.Add(new Temperature("System", 0));
@@ -898,8 +895,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
v.Add(new Voltage("VTT", 0));
v.Add(new Voltage("+5V", 1, 15, 10));
v.Add(new Voltage("+12V", 2, 30.9f, 10));
v.Add(new Voltage("CPU VCore", 5));
v.Add(new Voltage("DRAM", 6));
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("VBat", 8, 10, 10));
t.Add(new Temperature("System", 0));
@@ -914,8 +911,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
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));
v.Add(new Voltage("CPU VCore", 5));
v.Add(new Voltage("DRAM", 6));
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("VBat", 8, 10, 10));
t.Add(new Temperature("System", 0));
@@ -934,8 +931,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
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));
v.Add(new Voltage("CPU VCore", 5));
v.Add(new Voltage("DRAM", 6));
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("VBat", 8, 10, 10));
t.Add(new Temperature("System", 0));
@@ -950,8 +947,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
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));
v.Add(new Voltage("CPU VCore", 5));
v.Add(new Voltage("DRAM", 6));
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("VBat", 8, 10, 10));
t.Add(new Temperature("System", 0));
@@ -1003,8 +1000,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case Manufacturer.Shuttle:
switch (model) {
case Model.FH67: // IT8772E
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("DRAM", 1));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("DIMM", 1));
v.Add(new Voltage("PCH VCCIO", 2));
v.Add(new Voltage("CPU VCCIO", 3));
v.Add(new Voltage("Graphic Voltage", 4));
@@ -1063,7 +1060,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
switch (model) {
case Model.X58_SLI_Classified: // F71882
v.Add(new Voltage("VCC3V", 0, 150, 150));
v.Add(new Voltage("CPU VCore", 1, 47, 100));
v.Add(new Voltage("Vcore", 1, 47, 100));
v.Add(new Voltage("DIMM", 2, 47, 100));
v.Add(new Voltage("CPU VTT", 3, 24, 100));
v.Add(new Voltage("IOH Vcore", 4, 24, 100));
@@ -1080,7 +1077,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
break;
default:
v.Add(new Voltage("VCC3V", 0, 150, 150));
v.Add(new Voltage("CPU VCore", 1));
v.Add(new Voltage("Vcore", 1));
v.Add(new Voltage("Voltage #3", 2, true));
v.Add(new Voltage("Voltage #4", 3, true));
v.Add(new Voltage("Voltage #5", 4, true));
@@ -1097,7 +1094,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
break;
default:
v.Add(new Voltage("VCC3V", 0, 150, 150));
v.Add(new Voltage("CPU VCore", 1));
v.Add(new Voltage("Vcore", 1));
v.Add(new Voltage("Voltage #3", 2, true));
v.Add(new Voltage("Voltage #4", 3, true));
v.Add(new Voltage("Voltage #5", 4, true));
@@ -1127,7 +1124,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case Model.P8P67: // NCT6776F
case Model.P8P67_EVO: // NCT6776F
case Model.P8P67_PRO: // NCT6776F
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("+12V", 1, 11, 1));
v.Add(new Voltage("Analog +3.3V", 2, 34, 34));
v.Add(new Voltage("+3.3V", 3, 34, 34));
@@ -1146,7 +1143,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
c.Add(new Ctrl("Chassis Fan #1", 2));
break;
case Model.P8P67_M_PRO: // NCT6776F
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("+12V", 1, 11, 1));
v.Add(new Voltage("Analog +3.3V", 2, 34, 34));
v.Add(new Voltage("+3.3V", 3, 34, 34));
@@ -1164,7 +1161,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
f.Add(new Fan("Auxiliary Fan", 4));
break;
case Model.P8Z68_V_PRO: // NCT6776F
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("+12V", 1, 11, 1));
v.Add(new Voltage("Analog +3.3V", 2, 34, 34));
v.Add(new Voltage("+3.3V", 3, 34, 34));
@@ -1180,7 +1177,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
c.Add(new Ctrl("Fan #" + (i + 1), i));
break;
case Model.P9X79: // NCT6776F
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("+12V", 1, 11, 1));
v.Add(new Voltage("Analog +3.3V", 2, 34, 34));
v.Add(new Voltage("+3.3V", 3, 34, 34));
@@ -1195,7 +1192,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
c.Add(new Ctrl("Fan Control #" + (i + 1), i));
break;
default:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("Voltage #2", 1, true));
v.Add(new Voltage("AVCC", 2, 34, 34));
v.Add(new Voltage("3VCC", 3, 34, 34));
@@ -1241,8 +1238,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
c.Add(new Ctrl("Chassis Fan #1", 2));
}
break;
case Model.ASROCK_Z77PRO4M: //NCT6776F
v.Add(new Voltage("CPU VCore", 0, 0, 1, 0, false));
case Model.Z77PRO4M: //NCT6776F
v.Add(new Voltage("Vcore", 0, 0, 1, 0, false));
v.Add(new Voltage("+12V", 1, 56, 10, 0, false));
v.Add(new Voltage("AVCC", 2, 10, 10, 0, false));
v.Add(new Voltage("3VCC", 3, 10, 10, 0, false));
@@ -1263,7 +1260,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
c.Add(new Ctrl("Fan Control #" + (i + 1), i));
break;
default:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("Voltage #2", 1, true));
v.Add(new Voltage("AVCC", 2, 34, 34));
v.Add(new Voltage("3VCC", 3, 34, 34));
@@ -1285,7 +1282,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
}
break;
default:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("Voltage #2", 1, true));
v.Add(new Voltage("AVCC", 2, 34, 34));
v.Add(new Voltage("3VCC", 3, 34, 34));
@@ -1314,14 +1311,14 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case Manufacturer.ASRock:
switch (model)
{
case Model.ASROCK_A320M_HDV: //NCT6779D
v.Add(new Voltage("CPU VCore", 0, 10, 10, 0, false));
case Model.A320M_HDV: //NCT6779D
v.Add(new Voltage("Vcore", 0, 10, 10, 0, false));
v.Add(new Voltage("Chipset 1.05V", 1, 0, 1, 0, false));
v.Add(new Voltage("AVCC", 2, 10, 10, 0, false));
v.Add(new Voltage("3VCC", 3, 10, 10, 0, false));
v.Add(new Voltage("+12V", 4, 56, 10, 0, false));
v.Add(new Voltage("VcoreRef", 5, 0, 1, 0, false));
v.Add(new Voltage("DRAM", 6, 0, 1, 0, false));
v.Add(new Voltage("DIMM", 6, 0, 1, 0, false));
v.Add(new Voltage("3VSB", 7, 10, 10, 0, false));
v.Add(new Voltage("VBat", 8, 10, 10, 0, false));
//v.Add(new Voltage("#Unused 9", 9, 0, 1, 0, true));
@@ -1344,12 +1341,12 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
c.Add(new Ctrl("Fan Control #" + (i + 1), i));
break;
case Model.ASROCK_AB350_PRO4: //NCT6779D
case Model.ASROCK_AB350M_PRO4:
case Model.ASROCK_AB350M:
case Model.ASROCK_Fatal1ty_AB350_Gaming_K4:
case Model.ASROCK_AB350M_HDV:
v.Add(new Voltage("1 CPU VCore", 0, 10, 10, 0, false));
case Model.AB350_PRO4: //NCT6779D
case Model.AB350M_PRO4:
case Model.AB350M:
case Model.Fatal1ty_AB350_Gaming_K4:
case Model.AB350M_HDV:
v.Add(new Voltage("1 Vcore", 0, 10, 10, 0, false));
//v.Add(new Voltage("#Unused", 1, 0, 1, 0, true));
v.Add(new Voltage("3 AVCC", 2, 10, 10, 0, false));
v.Add(new Voltage("4 3VCC", 3, 10, 10, 0, false));
@@ -1379,14 +1376,14 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
c.Add(new Ctrl("Fan Control #" + (i + 1), i));
break;
case Model.ASROCK_PHANTOM_GAMING_6: //NCT6779D
v.Add(new Voltage("CPU VCore", 0, 10, 10, 0, false));
case Model.PHANTOM_GAMING_6: //NCT6779D
v.Add(new Voltage("Vcore", 0, 10, 10, 0, false));
v.Add(new Voltage("Chipset 1.05V", 1, 0, 1, 0, false));
v.Add(new Voltage("AVCC", 2, 10, 10, 0, false));
v.Add(new Voltage("3VCC", 3, 10, 10, 0, false));
v.Add(new Voltage("+12V", 4, 56, 10, 0, false));
v.Add(new Voltage("VDDCR_SOC", 5, 0, 1, 0, false));
v.Add(new Voltage("DRAM", 6, 0, 1, 0, false));
v.Add(new Voltage("DIMM", 6, 0, 1, 0, false));
v.Add(new Voltage("3VSB", 7, 10, 10, 0, false));
v.Add(new Voltage("VBat", 8, 10, 10, 0, false));
//v.Add(new Voltage("#Unused", 9, 0, 1, 0, true));
@@ -1410,7 +1407,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
break;
default:
v.Add(new Voltage("CPU VCore", 0, 10,10, 0, false));
v.Add(new Voltage("Vcore", 0, 10,10, 0, false));
v.Add(new Voltage("Voltage #2", 1, true));
v.Add(new Voltage("AVCC", 2, 34, 34));
v.Add(new Voltage("3VCC", 3, 34, 34));
@@ -1442,7 +1439,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case Manufacturer.ASUS:
switch (model) {
case Model.P8Z77_V: // NCT6779D
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("Voltage #2", 1, true));
v.Add(new Voltage("AVCC", 2, 34, 34));
v.Add(new Voltage("3VCC", 3, 34, 34));
@@ -1470,7 +1467,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
c.Add(new Ctrl("Chassis Fan #3", 3));
break;
case Model.ROG_MAXIMUS_APEX: // NCT6793D
v.Add(new Voltage("CPU VCore", 0, 2, 2));
v.Add(new Voltage("Vcore", 0, 2, 2));
v.Add(new Voltage("+5V", 1, 4, 1));
v.Add(new Voltage("AVSB", 2, 34, 34));
v.Add(new Voltage("3VCC", 3, 34, 34));
@@ -1480,7 +1477,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
v.Add(new Voltage("3VSB", 7, 34, 34));
v.Add(new Voltage("VBat", 8, 34, 34));
v.Add(new Voltage("VTT", 9));
v.Add(new Voltage("DRAM", 10, 1, 1));
v.Add(new Voltage("DIMM", 10, 1, 1));
v.Add(new Voltage("VCCSA", 11));
v.Add(new Voltage("PCH Core", 12));
v.Add(new Voltage("CPU PLLs", 13));
@@ -1503,8 +1500,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
c.Add(new Ctrl("Chassis Fan #3", 3));
c.Add(new Ctrl("AIO Pump", 4));
break;
case Model.ASUS_Z170_A: //NCT6793D
v.Add(new Voltage("CPU VCore", 0, 2, 2));
case Model.Z170_A: //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));
v.Add(new Voltage("3VCC", 3, 34, 34));
@@ -1514,7 +1511,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
v.Add(new Voltage("3VSB_ATX", 7, 34, 34));
v.Add(new Voltage("VBat", 8, 34, 34));
v.Add(new Voltage("VTT", 9));
v.Add(new Voltage("DRAM", 10, 1, 1));
v.Add(new Voltage("DIMM", 10, 1, 1));
v.Add(new Voltage("VCCSA", 11));
v.Add(new Voltage("PCH Core", 12));
v.Add(new Voltage("CPU PLLs", 13));
@@ -1534,7 +1531,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
c.Add(new Ctrl("Fan Control #" + (i + 1), i));
break;
default:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("Voltage #2", 1, true));
v.Add(new Voltage("AVCC", 2, 34, 34));
v.Add(new Voltage("3VCC", 3, 34, 34));
@@ -1557,29 +1554,29 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
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));
f.Add(new Fan("Fan #" + (i + 1), i));
for (int i = 0; i < superIO.Controls.Length; i++)
c.Add(new Ctrl("Fan Control #" + (i + 1), i));
c.Add(new Ctrl("Fan Control #" + (i + 1), i));
break;
}
break;
case Manufacturer.MSI:
switch (model) {
case Model.B360M_PRO_VDH: // NCT6797D
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("+5V", 1, 4, 1));
v.Add(new Voltage("AVCC", 2, 34, 34));
v.Add(new Voltage("3VCC", 3, 34, 34));
v.Add(new Voltage("+12V", 4, 11, 1));
v.Add(new Voltage("Voltage #6", 5, true));
//v.Add(new Voltage("Voltage #6", 5, true));
v.Add(new Voltage("CPU I/O", 6));
v.Add(new Voltage("3VSB", 7, 34, 34));
v.Add(new Voltage("VTT", 9));
v.Add(new Voltage("CPU SA", 10));
v.Add(new Voltage("Voltage #12", 11, true));
v.Add(new Voltage("PCH", 12));
v.Add(new Voltage("DRAM", 13, 1, 1));
v.Add(new Voltage("Voltage #15", 14, true));
//v.Add(new Voltage("Voltage #12", 11, true));
v.Add(new Voltage("NB/SoC", 12));
v.Add(new Voltage("DIMM", 13, 1, 1));
//v.Add(new Voltage("Voltage #15", 14, true));
t.Add(new Temperature("CPU", 0));
t.Add(new Temperature("Auxiliary", 1));
t.Add(new Temperature("Motherboard", 2));
@@ -1591,8 +1588,41 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
c.Add(new Ctrl("System Fan #1", 2));
c.Add(new Ctrl("System Fan #2", 3));
break;
case Model.B450A_PRO: // NCT6797D
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("+5V", 1, 4, 1));
v.Add(new Voltage("AVCC", 2, 34, 34));
v.Add(new Voltage("3VCC", 3, 34, 34));
v.Add(new Voltage("+12V", 4, 11, 1));
//v.Add(new Voltage("Voltage #6", 5, false));
//v.Add(new Voltage("CPU I/O", 6));
v.Add(new Voltage("3VSB", 7, 34, 34));
v.Add(new Voltage("VTT", 9));
v.Add(new Voltage("CPU SA", 10));
//v.Add(new Voltage("Voltage #12", 11, false));
v.Add(new Voltage("NB/SoC", 12));
v.Add(new Voltage("DIMM", 13, 1, 1));
//v.Add(new Voltage("Voltage #15", 14, false));
t.Add(new Temperature("CPU", 0));
t.Add(new Temperature("CPU (PECI)", 1));
t.Add(new Temperature("System", 2));
t.Add(new Temperature("VR MOSS", 3));
t.Add(new Temperature("PCH", 5));
f.Add(new Fan("Pump Fan", 0));
f.Add(new Fan("CPU 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));
f.Add(new Fan("System Fan #4", 5));
c.Add(new Ctrl("Pump Fan", 0));
c.Add(new Ctrl("CPU Fan", 1));
c.Add(new Ctrl("System Fan #1", 2));
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
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("+5V", 1, 4, 1));
v.Add(new Voltage("AVCC", 2, 34, 34));
v.Add(new Voltage("3VCC", 3, 34, 34));
@@ -1604,7 +1634,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
v.Add(new Voltage("CPU SA", 10));
v.Add(new Voltage("Voltage #12", 11, true));
v.Add(new Voltage("PCH", 12));
v.Add(new Voltage("DRAM", 13, 1, 1));
v.Add(new Voltage("DIMM", 13, 1, 1));
v.Add(new Voltage("Voltage #15", 14, true));
t.Add(new Temperature("CPU", 0));
t.Add(new Temperature("Auxiliary", 1));
@@ -1623,7 +1653,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
c.Add(new Ctrl("System Fan #4", 5));
break;
default:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("Voltage #2", 1, true));
v.Add(new Voltage("AVCC", 2, 34, 34));
v.Add(new Voltage("3VCC", 3, 34, 34));
@@ -1653,7 +1683,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
}
break;
default:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("Voltage #2", 1, true));
v.Add(new Voltage("AVCC", 2, 34, 34));
v.Add(new Voltage("3VCC", 3, 34, 34));
@@ -1690,7 +1720,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case Manufacturer.ASRock:
switch (model) {
case Model.AOD790GX_128M: // W83627EHF
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("Analog +3.3V", 2, 34, 34));
v.Add(new Voltage("+3.3V", 4, 10, 10));
v.Add(new Voltage("+5V", 5, 20, 10));
@@ -1703,7 +1733,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
f.Add(new Fan("Chassis Fan", 1));
break;
default:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("Voltage #2", 1, true));
v.Add(new Voltage("AVCC", 2, 34, 34));
v.Add(new Voltage("3VCC", 3, 34, 34));
@@ -1724,7 +1754,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
break;
} break;
default:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("Voltage #2", 1, true));
v.Add(new Voltage("AVCC", 2, 34, 34));
v.Add(new Voltage("3VCC", 3, 34, 34));
@@ -1753,7 +1783,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case Manufacturer.ASRock:
switch (model) {
case Model._880GMH_USB3: // W83627DHG-P
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
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));
@@ -1766,7 +1796,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
f.Add(new Fan("Power Fan", 2));
break;
default:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("Voltage #2", 1, true));
v.Add(new Voltage("AVCC", 2, 34, 34));
v.Add(new Voltage("3VCC", 3, 34, 34));
@@ -1791,7 +1821,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case Model.P6T: // W83667HG
case Model.P6X58D_E: // W83667HG
case Model.Rampage_II_GENE: // W83667HG
v.Add(new Voltage("CPU VCore", 0));
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));
v.Add(new Voltage("+3.3V", 3, 34, 34));
@@ -1807,7 +1837,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
f.Add(new Fan("Chassis Fan #3", 4));
break;
case Model.Rampage_Extreme: // W83667HG
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("+12V", 1, 12, 2));
v.Add(new Voltage("Analog +3.3V", 2, 34, 34));
v.Add(new Voltage("+3.3V", 3, 34, 34));
@@ -1823,7 +1853,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
f.Add(new Fan("Chassis Fan #3", 4));
break;
default:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("Voltage #2", 1, true));
v.Add(new Voltage("AVCC", 2, 34, 34));
v.Add(new Voltage("3VCC", 3, 34, 34));
@@ -1844,7 +1874,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
}
break;
default:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Vcore", 0));
v.Add(new Voltage("Voltage #2", 1, true));
v.Add(new Voltage("AVCC", 2, 34, 34));
v.Add(new Voltage("3VCC", 3, 34, 34));
Hardware/Nic/NicGroup.cs
+1 -1
View File
@@ -29,7 +29,7 @@ namespace OpenHardwareMonitor.Hardware.Nic {
return;
}
// When multiple events fire concurrently, we don't want threads interferring
// When multiple events fire concurrently, we don't want threads interfering
// with others as they manipulate non-thread safe state.
lock (_scanLock) {
var networkInterfaces = NetworkInterface.GetAllNetworkInterfaces()