mir/openhardwaremonitor
2
0
Fork 0
mirror of https://github.com/openhardwaremonitor/openhardwaremonitor synced 2025-09-03 07:45:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

An attempt at adding a mainboard specific configuration for the ASUS P6X58D-E.

Browse Source
This commit is contained in:
Michael Möller
2010-07-11 15:52:50 +00:00
parent c7ef3b8ecf
commit 5ff4174c1f
7 changed files with 85 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Hardware/LPC/W836XX.cs
View File

@@ -123,7 +123,7 @@ namespace OpenHardwareMonitor.Hardware.LPC {
break; break;
case Chip.W83627DHG: case Chip.W83627DHG:
case Chip.W83627DHGP: case Chip.W83627DHGP:
// do not add temperature sensor registers that read PECI // note temperature sensor registers that read PECI
byte sel = ReadByte(0, TEMPERATURE_SOURCE_SELECT_REG); byte sel = ReadByte(0, TEMPERATURE_SOURCE_SELECT_REG);
peciTemperature[0] = (sel & 0x07) != 0; peciTemperature[0] = (sel & 0x07) != 0;
peciTemperature[1] = (sel & 0x70) != 0; peciTemperature[1] = (sel & 0x70) != 0;

2
Hardware/Mainboard/Mainboard.cs
View File

@@ -85,7 +85,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
superIOHardware[i] = new SuperIOHardware(superIO[i], superIOHardware[i] = new SuperIOHardware(superIO[i],
smbios.Board != null ? smbios.Board.Manufacturer : smbios.Board != null ? smbios.Board.Manufacturer :
Manufacturer.Unknown, smbios.Board != null ? smbios.Board.Model : Manufacturer.Unknown, smbios.Board != null ? smbios.Board.Model :
Model.Unknown); Model.Unknown);
} }
public string Name { public string Name {

4
Hardware/Mainboard/Manufacturer.cs
View File

@@ -39,12 +39,16 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
public enum Manufacturer { public enum Manufacturer {
ASUS, ASUS,
Dell,
DFI, DFI,
EPoX, EPoX,
EVGA, EVGA,
FIC,
Gigabyte, Gigabyte,
HP,
IBM, IBM,
MSI, MSI,
XFX,
Unknown Unknown
} }

1
Hardware/Mainboard/Model.cs
View File

@@ -43,6 +43,7 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
M2N_SLI_DELUXE, M2N_SLI_DELUXE,
M4A79XTD_EVO, M4A79XTD_EVO,
P5W_DH_Deluxe, P5W_DH_Deluxe,
P6X58D_E,
// DFI // DFI
LP_BI_P45_T2RS_Elite, LP_BI_P45_T2RS_Elite,

14
Hardware/Mainboard/SMBIOS.cs
View File

@@ -255,6 +255,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
switch (manufacturerName) { switch (manufacturerName) {
case "ASUSTeK Computer INC.": case "ASUSTeK Computer INC.":
manufacturer = Manufacturer.ASUS; break; manufacturer = Manufacturer.ASUS; break;
case "Dell Inc.":
manufacturer = Manufacturer.Dell; break;
case "DFI": case "DFI":
case "DFI Inc.": case "DFI Inc.":
manufacturer = Manufacturer.DFI; break; manufacturer = Manufacturer.DFI; break;
@@ -262,13 +264,21 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
manufacturer = Manufacturer.EPoX; break; manufacturer = Manufacturer.EPoX; break;
case "EVGA": case "EVGA":
manufacturer = Manufacturer.EVGA; break; manufacturer = Manufacturer.EVGA; break;
case "First International Computer, Inc.":
manufacturer = Manufacturer.FIC; break;
case "Gigabyte Technology Co., Ltd.": case "Gigabyte Technology Co., Ltd.":
manufacturer = Manufacturer.Gigabyte; break; manufacturer = Manufacturer.Gigabyte; break;
case "Hewlett-Packard":
manufacturer = Manufacturer.HP; break;
case "IBM": case "IBM":
manufacturer = Manufacturer.IBM; break; manufacturer = Manufacturer.IBM; break;
case "MICRO-STAR INTERNATIONAL CO., LTD": case "MICRO-STAR INTERNATIONAL CO., LTD":
case "MICRO-STAR INTERNATIONAL CO.,LTD": case "MICRO-STAR INTERNATIONAL CO.,LTD":
manufacturer = Manufacturer.MSI; break; manufacturer = Manufacturer.MSI; break;
case "XFX":
manufacturer = Manufacturer.XFX; break;
case "To be filled by O.E.M.":
manufacturer = Manufacturer.Unknown; break;
default: default:
manufacturer = Manufacturer.Unknown; break; manufacturer = Manufacturer.Unknown; break;
} }
@@ -286,6 +296,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
model = Model.M4A79XTD_EVO; break; model = Model.M4A79XTD_EVO; break;
case "P5W DH Deluxe": case "P5W DH Deluxe":
model = Model.P5W_DH_Deluxe; break; model = Model.P5W_DH_Deluxe; break;
case "P6X58D-E":
model = Model.P6X58D_E; break;
case "LP BI P45-T2RS Elite": case "LP BI P45-T2RS Elite":
model = Model.LP_BI_P45_T2RS_Elite; break; model = Model.LP_BI_P45_T2RS_Elite; break;
case "LP DK P55-T3eH9": case "LP DK P55-T3eH9":
@@ -312,6 +324,8 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
model = Model.X38_DS5; break; model = Model.X38_DS5; break;
case "X58A-UD3R": case "X58A-UD3R":
model = Model.X58A_UD3R; break; model = Model.X58A_UD3R; break;
case "To be filled by O.E.M.":
model = Model.Unknown; break;
default: default:
model = Model.Unknown; break; model = Model.Unknown; break;
} }

79
Hardware/Mainboard/SuperIOHardware.cs
View File

@@ -421,23 +421,68 @@ namespace OpenHardwareMonitor.Hardware.Mainboard {
case Chip.W83627DHGP: case Chip.W83627DHGP:
case Chip.W83667HG: case Chip.W83667HG:
case Chip.W83667HGB: case Chip.W83667HGB:
v.Add(new Voltage("CPU VCore", 0)); switch (manufacturer) {
v.Add(new Voltage("Voltage #2", 1, true)); case Manufacturer.ASUS:
v.Add(new Voltage("AVCC", 2, 34, 34, 0)); switch (model) {
v.Add(new Voltage("3VCC", 3, 34, 34, 0)); case Model.P6X58D_E:
v.Add(new Voltage("Voltage #5", 4, true)); v.Add(new Voltage("CPU VCore", 0));
v.Add(new Voltage("Voltage #6", 5, true)); v.Add(new Voltage("+12V", 1, 11.5f, 1.91f, 0));
v.Add(new Voltage("Voltage #7", 6, true)); v.Add(new Voltage("Analog +3.3V", 2, 34, 34, 0));
v.Add(new Voltage("3VSB", 7, 34, 34, 0)); v.Add(new Voltage("+3.3V", 3, 34, 34, 0));
v.Add(new Voltage("VBAT", 8, 34, 34, 0)); v.Add(new Voltage("+5V", 4, 20, 10, 0));
t.Add(new Temperature("CPU", 0)); v.Add(new Voltage("Voltage #6", 5, true));
t.Add(new Temperature("Auxiliary", 1)); v.Add(new Voltage("Voltage #7", 6, true));
t.Add(new Temperature("System", 2)); v.Add(new Voltage("Standby +3.3V", 7, 34, 34, 0));
f.Add(new Fan("System", 0)); v.Add(new Voltage("VBAT", 8, 34, 34, 0));
f.Add(new Fan("CPU", 1)); t.Add(new Temperature("CPU", 0));
f.Add(new Fan("Auxiliary", 2)); t.Add(new Temperature("Motherboard", 2));
f.Add(new Fan("CPU #2", 3)); f.Add(new Fan("Chassis Fan #1", 0));
f.Add(new Fan("Auxiliary #2", 4)); f.Add(new Fan("CPU", 1));
f.Add(new Fan("Power", 2));
f.Add(new Fan("Chassis Fan #2", 3));
f.Add(new Fan("Chassis Fan #3", 4));
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", 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));
break;
}
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", 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));
break;
}
break; break;
case Chip.W83627HF: case Chip.W83627HF:
case Chip.W83627THF: case Chip.W83627THF:

4
Properties/AssemblyInfo.cs
View File

@@ -69,5 +69,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.1.37.0")] [assembly: AssemblyVersion("0.1.37.1")]
[assembly: AssemblyFileVersion("0.1.37.0")] [assembly: AssemblyFileVersion("0.1.37.1")]