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

Added a mainboard specific configuration for the ASRock 880GMH/USB3

Browse Source
This commit is contained in:
Michael Möller
2010-07-11 21:26:49 +00:00
parent 5ff4174c1f
commit 8054a3d977
4 changed files with 72 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Hardware/Mainboard/Manufacturer.cs
+1
View File
@@ -38,6 +38,7 @@
namespace OpenHardwareMonitor.Hardware.Mainboard {
public enum Manufacturer {
ASRock,
ASUS,
Dell,
DFI,
Hardware/Mainboard/Model.cs
+3
View File
@@ -38,6 +38,9 @@
namespace OpenHardwareMonitor.Hardware.Mainboard {
public enum Model {
// ASRock
_880GMH_USB3,
// ASUS
Crosshair_III_Formula,
M2N_SLI_DELUXE,
Hardware/Mainboard/SMBIOS.cs
+4
View File
@@ -253,6 +253,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
this.manufacturerName = manufacturerName;
switch (manufacturerName) {
case "ASRock":
manufacturer = Manufacturer.ASRock; break;
case "ASUSTeK Computer INC.":
manufacturer = Manufacturer.ASUS; break;
case "Dell Inc.":
@@ -288,6 +290,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
this.productName = productName;
switch (productName) {
case "880GMH/USB3":
model = Model._880GMH_USB3; break;
case "Crosshair III Formula":
model = Model.Crosshair_III_Formula; break;
case "M2N-SLI DELUXE":
Hardware/Mainboard/SuperIOHardware.cs
+64 -22
View File
@@ -411,17 +411,53 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
t.Add(new Temperature("CPU", 0));
t.Add(new Temperature("Auxiliary", 1));
t.Add(new Temperature("System", 2));
f.Add(new Fan("System", 0));
f.Add(new Fan("CPU", 1));
f.Add(new Fan("Auxiliary", 2));
f.Add(new Fan("CPU #2", 3));
f.Add(new Fan("Auxiliary #2", 4));
f.Add(new Fan("System Fan", 0));
f.Add(new Fan("CPU Fan", 1));
f.Add(new Fan("Auxiliary Fan", 2));
f.Add(new Fan("CPU Fan #2", 3));
f.Add(new Fan("Auxiliary Fan #2", 4));
break;
case Chip.W83627DHG:
case Chip.W83627DHGP:
case Chip.W83667HG:
case Chip.W83667HGB:
switch (manufacturer) {
case Manufacturer.ASRock:
switch (model) {
case Model._880GMH_USB3:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("+3.3V", 3, 34, 34, 0));
v.Add(new Voltage("+5V", 5, 15, 7.5f, 0));
v.Add(new Voltage("+12V", 6, 56, 10, 0));
v.Add(new Voltage("Standby +3.3V", 7, 34, 34, 0));
v.Add(new Voltage("VBAT", 8, 34, 34, 0));
t.Add(new Temperature("CPU", 0));
t.Add(new Temperature("Motherboard", 2));
f.Add(new Fan("Chassis Fan", 0));
f.Add(new Fan("CPU Fan", 1));
f.Add(new Fan("Power Fan", 2));
break;
default:
v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Voltage #2", 1, true));
v.Add(new Voltage("AVCC", 2, 34, 34, 0));
v.Add(new Voltage("3VCC", 3, 34, 34, 0));
v.Add(new Voltage("Voltage #5", 4, true));
v.Add(new Voltage("Voltage #6", 5, true));
v.Add(new Voltage("Voltage #7", 6, true));
v.Add(new Voltage("3VSB", 7, 34, 34, 0));
v.Add(new Voltage("VBAT", 8, 34, 34, 0));
t.Add(new Temperature("CPU", 0));
t.Add(new Temperature("Auxiliary", 1));
t.Add(new Temperature("System", 2));
f.Add(new Fan("System Fan", 0));
f.Add(new Fan("CPU Fan", 1));
f.Add(new Fan("Auxiliary Fan", 2));
f.Add(new Fan("CPU Fan #2", 3));
f.Add(new Fan("Auxiliary Fan #2", 4));
break;
}
break;
case Manufacturer.ASUS:
switch (model) {
case Model.P6X58D_E:
@@ -429,16 +465,17 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
v.Add(new Voltage("+12V", 1, 11.5f, 1.91f, 0));
v.Add(new Voltage("Analog +3.3V", 2, 34, 34, 0));
v.Add(new Voltage("+3.3V", 3, 34, 34, 0));
v.Add(new Voltage("+5V", 4, 20, 10, 0));
v.Add(new Voltage("+5V", 4, 15, 7.5f, 0));
v.Add(new Voltage("Voltage #6", 5, true));
v.Add(new Voltage("Voltage #7", 6, true));
v.Add(new Voltage("Standby +3.3V", 7, 34, 34, 0));
v.Add(new Voltage("VBAT", 8, 34, 34, 0));
t.Add(new Temperature("CPU", 0));
t.Add(new Temperature("Auxiliary", 1, true));
t.Add(new Temperature("Motherboard", 2));
f.Add(new Fan("Chassis Fan #1", 0));
f.Add(new Fan("CPU", 1));
f.Add(new Fan("Power", 2));
f.Add(new Fan("CPU Fan", 1));
f.Add(new Fan("Power Fan", 2));
f.Add(new Fan("Chassis Fan #2", 3));
f.Add(new Fan("Chassis Fan #3", 4));
break;
@@ -455,11 +492,11 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
t.Add(new Temperature("CPU", 0));
t.Add(new Temperature("Auxiliary", 1));
t.Add(new Temperature("System", 2));
f.Add(new Fan("System", 0));
f.Add(new Fan("CPU", 1));
f.Add(new Fan("Auxiliary", 2));
f.Add(new Fan("CPU #2", 3));
f.Add(new Fan("Auxiliary #2", 4));
f.Add(new Fan("System Fan", 0));
f.Add(new Fan("CPU Fan", 1));
f.Add(new Fan("Auxiliary Fan", 2));
f.Add(new Fan("CPU Fan #2", 3));
f.Add(new Fan("Auxiliary Fan #2", 4));
break;
}
break;
@@ -476,11 +513,11 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
t.Add(new Temperature("CPU", 0));
t.Add(new Temperature("Auxiliary", 1));
t.Add(new Temperature("System", 2));
f.Add(new Fan("System", 0));
f.Add(new Fan("CPU", 1));
f.Add(new Fan("Auxiliary", 2));
f.Add(new Fan("CPU #2", 3));
f.Add(new Fan("Auxiliary #2", 4));
f.Add(new Fan("System Fan", 0));
f.Add(new Fan("CPU Fan", 1));
f.Add(new Fan("Auxiliary Fan", 2));
f.Add(new Fan("CPU Fan #2", 3));
f.Add(new Fan("Auxiliary Fan #2", 4));
break;
}
break;
@@ -497,9 +534,9 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
t.Add(new Temperature("CPU", 0));
t.Add(new Temperature("Auxiliary", 1));
t.Add(new Temperature("System", 2));
f.Add(new Fan("System", 0));
f.Add(new Fan("CPU", 1));
f.Add(new Fan("Auxiliary", 2));
f.Add(new Fan("System Fan", 0));
f.Add(new Fan("CPU Fan", 1));
f.Add(new Fan("Auxiliary Fan", 2));
break;
default:
for (int i = 0; i < superIO.Voltages.Length; i++)
@@ -621,10 +658,15 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
private class Temperature {
public readonly string Name;
public readonly int Index;
public readonly bool Hidden;
public Temperature(string name, int index) {
public Temperature(string name, int index) :
this(name, index, false) { }
public Temperature(string name, int index, bool hidden) {
this.Name = name;
this.Index = index;
this.Hidden = hidden;
}
}